[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: atp@tinyerp.co.in-20100614054449-kov9r566gpvqohey

addons/account/__openerp__.py

@@ -23,7 +23,7 @@
 {
     "name" : "Accounting and Financial Management",
     "version" : "1.1",
-    "depends" : ["product", "analytic", "process"],
+    "depends" : ["product", "analytic", "process","board"],
     "author" : "Tiny",
     "category": 'Generic Modules/Accounting',
     "description": """Financial and accounting module that covers:
@@ -34,6 +34,10 @@
     Budgets
     Customer and Supplier Invoices
     Bank statements
+    Creates a dashboards for accountants that includes:
+    * List of uninvoiced quotations
+    * Graph of aged receivables
+    * Graph of aged incomes    
 
 The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or
 grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a
@@ -100,9 +104,9 @@ module named account_voucherss
         'project/wizard/account_analytic_chart_view.xml',
         'product_view.xml',
         'account_assert_test.xml',
-#        'process/statement_process.xml',
-#        'process/customer_invoice_process.xml',
-#        'process/supplier_invoice_process.xml',
+        'process/statement_process.xml',
+        'process/customer_invoice_process.xml',
+        'process/supplier_invoice_process.xml',
         'sequence_view.xml',
         'company_view.xml',
         'account_installer.xml',
@@ -111,7 +115,8 @@ module named account_voucherss
         'report/account_report_view.xml',
         'report/account_analytic_report_view.xml',
         'report/account_account_report_view.xml',
-        'report/account_analytic_entries_report_view.xml'
+        'report/account_analytic_entries_report_view.xml',
+        'board_account_view.xml',
     ],
     'demo_xml': [
         #'demo/price_accuracy00.yml',
@@ -120,10 +125,19 @@ module named account_voucherss
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
         'account_unit_test.xml',
+        'board_account_demo.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
         'test/account_supplier_invoice.yml',
+        'test/account_change_currency.yml',
+        'test/chart_of_account.yml',
+        'test/account_period_close.yml',
+        'test/account_fiscalyear_close_state.yml',
+        'test/account_invoice_state.yml',
+        'test/account_use_model.yml',
+        'test/account_validate_account_move.yml',
+#        'test/account_fiscalyear_close.yml',
     ],
     'installable': True,
     'active': False,

addons/account/account.py

@@ -62,7 +62,7 @@ class account_payment_term(osv.osv):
             elif line.value == 'balance':
                 amt = round(amount, prec)
             if amt:
-                next_date = datetime.strptime(date_ref, '%y-%m-%d') + relativedelta(days=line.days)
+                next_date = datetime.strptime(date_ref, '%Y-%m-%d') + relativedelta(days=line.days)
                 if line.days2 < 0:
                     next_date += relativedelta(day=line.days2)
                 if line.days2 > 0:
@@ -509,8 +509,13 @@ class account_account(osv.osv):
     def write(self, cr, uid, ids, vals, context=None):
         if context is None:
             context = {}
+
+        if 'company_id' in vals:
+            move_lines = self.pool.get('account.move.line').search(cr, uid, [('account_id', 'in', ids)])
+            if move_lines:
+                raise osv.except_osv(_('Warning !'), _('You cannot modify Company of account as its related record exist in Entry Lines'))
         if 'active' in vals and not vals['active']:
-            self._check_moves(cr, uid, ids, "write", context)
+            self._check_moves(cr, uid, ids, "write", context=context)
         if 'type' in vals.keys():
             self._check_allow_type_change(cr, uid, ids, vals['type'], context=context)
         return super(account_account, self).write(cr, uid, ids, vals, context=context)
@@ -557,42 +562,46 @@ class account_journal(osv.osv):
     _name = "account.journal"
     _description = "Journal"
     _columns = {
-        'name': fields.char('Journal Name', size=64, required=True, translate=True),
-        'code': fields.char('Code', size=16),
-        'type': fields.selection([('sale', 'Sale'), ('purchase', 'Purchase'), ('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
+        'name': fields.char('Journal Name', size=64, required=True, translate=True,help="Name of the journal"),
+        'code': fields.char('Code', size=16,required=True,help="Code of the journal"),
+        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'),('expense', 'Expense'), ('cash', 'Cash'), ('bank', 'Bank'), ('general', 'General'), ('situation', 'Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for Sale journal to be used at the time of making invoice."\
                                  " Select 'Purchase' for Purchase Journal to be used at the time of approving purchase order."\
                                  " Select 'Cash' to be used at the time of making payment."\
                                  " Select 'General' to be used at the time of stock input/output."\
                                  " Select 'Situation' to be used at the time of making vouchers."),
         'refund_journal': fields.boolean('Refund Journal', help='Fill this if the journal is to be used for refunds of invoices.'),
-
         'type_control_ids': fields.many2many('account.account.type', 'account_journal_type_rel', 'journal_id','type_id', 'Type Controls', domain=[('code','<>','view'), ('code', '<>', 'closed')]),
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
-
-        'active': fields.boolean('Active', help="If the active field is set to true, it will allow you to hide the journal without removing it."),
-        'view_id': fields.many2one('account.journal.view', 'View', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
-        'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]"),
-        'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]"),
+        'view_id': fields.many2one('account.journal.view', 'Display Mode', required=True, help="Gives the view used when writing or browsing entries in this journal. The view tells Open ERP which fields should be visible, required or readonly and in which order. You can create your own view for a faster encoding in each journal."),
+        'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]",help="It acts as a default account for credit amount"),
+        'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]",help="It acts as a default account for debit amount"),
         'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
-        'update_posted': fields.boolean('Allow Cancelling Entries'),
+        'update_posted': fields.boolean('Allow Cancelling Entries',help="Check this box if you want to cancel the entries related to this journal or want to cancel the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
         'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True),
         'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"),
         'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'),
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'),
-        'company_id': fields.many2one('res.company', 'Company', required=True,select=1),
+        'company_id': fields.many2one('res.company', 'Company', required=True,select=1,help="Company associated with a journal"),
         'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \
             help="The sequence used for invoice numbers in this journal."),
         'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
     }
 
     _defaults = {
-        'active': lambda *a: 1,
         'user_id': lambda self,cr,uid,context: uid,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
     }
+    def write(self, cr, uid, ids, vals, context=None):
+        obj=[]
+        if 'company_id' in vals:
+            move_lines = self.pool.get('account.move.line').search(cr, uid, [('journal_id', 'in', ids)])
+            if move_lines:
+                raise osv.except_osv(_('Warning !'), _('You cannot modify company of this journal as its related record exist in Entry Lines'))
+        return super(account_journal, self).write(cr, uid, ids, vals, context=context)
+
     def create(self, cr, uid, vals, context={}):
         journal_id = super(account_journal, self).create(cr, uid, vals, context)
 #       journal_name = self.browse(cr, uid, [journal_id])[0].code
@@ -618,6 +627,16 @@ class account_journal(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
+    def onchange_type(self, cr, uid, ids, type):
+        res={}
+        for line in self.browse(cr, uid, ids):
+            if type == 'situation':
+                  res= {'value':{'centralisation': True}}
+            else:
+                  res= {'value':{'centralisation': False}}
+        return res
+
+
 account_journal()
 
 class account_fiscalyear(osv.osv):
@@ -711,7 +730,7 @@ class account_period(osv.osv):
         'fiscalyear_id': fields.many2one('account.fiscalyear', 'Fiscal Year', required=True, states={'done':[('readonly',True)]}, select=True),
         'state': fields.selection([('draft','Draft'), ('done','Done')], 'State', readonly=True,
                                   help='When monthly periods are created. The state is \'Draft\'. At the end of monthly period it is in \'Done\' state.'),
-        'company_id': fields.many2one('res.company', 'Company', required=True)
+        'company_id': fields.related('fiscalyear_id','company_id',type='many2one',relation='res.company',string='Company',store=True)
     }
     _defaults = {
         'state': lambda *a: 'draft',
@@ -784,6 +803,14 @@ class account_period(osv.osv):
             ids = self.search(cr, user, [('name',operator,name)]+ args, limit=limit)
         return self.name_get(cr, user, ids, context=context)
 
+    def write(self, cr, uid, ids, vals, context=None):
+        obj=[]
+        if 'company_id' in vals:
+            move_lines = self.pool.get('account.move.line').search(cr, uid, [('period_id', 'in', ids)])
+            if move_lines:
+                raise osv.except_osv(_('Warning !'), _('You cannot modify company of this period as its related record exist in Entry Lines'))
+        return super(account_period, self).write(cr, uid, ids, vals, context=context)
+
 account_period()
 
 class account_journal_period(osv.osv):
@@ -809,7 +836,7 @@ class account_journal_period(osv.osv):
         'state': fields.selection([('draft','Draft'), ('printed','Printed'), ('done','Done')], 'State', required=True, readonly=True,
                                   help='When journal period is created. The state is \'Draft\'. If a report is printed it comes to \'Printed\' state. When all transactions are done, it comes in \'Done\' state.'),
         'fiscalyear_id': fields.related('period_id', 'fiscalyear_id', string='Fiscal Year', type='many2one', relation='account.fiscalyear'),
-        'company_id' : fields.many2one('res.company', 'Company')
+        'company_id': fields.related('journal_id','company_id',type='many2one',relation='res.company',string='Company')
     }
 
     def _check(self, cr, uid, ids, context={}):

addons/account/account_installer.xml

@@ -19,26 +19,26 @@
                  position="attributes">
             <attribute name="string">You can enhance OpenERP's basic accounting support with a few additional OpenERP applications.</attribute>
           </xpath>
-		  <xpath expr="//button[@string='Install Modules']" position="attributes">
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
                 <attribute name="string">Configure</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>23</attribute>
               <attribute name='string'></attribute>
-	      </xpath>
-	      <group colspan="8">
-	      <group colspan="4" height="450" width="600">
+          </xpath>
+          <group colspan="8">
+          <group colspan="4" height="450" width="600">
             <field name="charts"/>
              <group colspan="4">
-            	<separator col="4" colspan="4" string="Configure Fiscal Year"/>
+                <separator col="4" colspan="4" string="Configure Fiscal Year"/>
                 <field name="date_start" on_change="on_change_start_date(date_start)"/>
                 <field name="date_stop"/>
                 <field name="period" colspan="4"/>
             </group>
              <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<separator col="4" colspan="4" string="Bank and Cost Account"/>
-            	 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
-            	 	<form string="">
+                <separator col="4" colspan="4" string="Bank and Cost Account"/>
+                 <field colspan="4" mode="tree" name="bank_accounts_id" nolabel="1" widget="one2many_list">
+                     <form string="">
                       <field name="acc_name"/>
                       <field name="account_type"/>
                       <field name="currency_id" widget="selection"/>
@@ -51,15 +51,15 @@
                   </field>
             </group>
             <group colspan="4" attrs="{'invisible':[('charts','!=','configurable')]}">
-            	<field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
-            	<field name="purchase_tax" colspan="2" />
+                <field name="sale_tax" colspan="2" on_change="on_change_tax(sale_tax)"/>
+                <field name="purchase_tax" colspan="2" />
             </group>
             <group colspan="4" groups="base.group_extended">
-            	<separator col="4" colspan="4" string="Install Extra Account Module"/>
-            	<field name="account_analytic_plans"/>
-            	<field name="account_payment"/>
-            	<field name="account_followup"/>
-            	<field name="account_asset"/>
+                <separator col="4" colspan="4" string="Install Extra Account Module"/>
+                <field name="account_analytic_plans"/>
+                <field name="account_payment"/>
+                <field name="account_followup"/>
+                <field name="account_asset"/>
             </group>
           </group>
           </group>
@@ -88,12 +88,12 @@
         <field name="name">account_installer_action_replace</field>
         <field name="type">tree</field>
         <field name="inherit_id" ref="base.ir_actions_todo_tree"/>
-  		<field name="arch" type="xml">
-  		  <xpath expr="//button[@string='Launch']" position="replace">
-        	<button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
+          <field name="arch" type="xml">
+            <xpath expr="//button[@string='Launch']" position="replace">
+            <button name="%(action_account_installer)d" states="open,skip" string="Launch" type="action" icon="gtk-execute" help="Launch Configuration Wizard"/>
       </xpath>
         </field>
-	</record>
+    </record>
 
   </data>
 </openerp>

addons/account/account_invoice_view.xml

@@ -53,7 +53,7 @@
                     <notebook>
                         <page string="Line">
                             <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
-                            <field name="uos_id"/>
+                            <field name="uos_id"  widget="selection" on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"/>
                             <field name="quantity"/>
                             <field name="price_unit"/>
                             <field name="discount"/>
@@ -220,7 +220,8 @@
                             <field name="name"/>
                             <newline/>
                             <field name="origin" groups="base.group_extended"/>
-                            <field colspan="4" domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
+                            <field domain="[('partner_id','=',partner_id)]" name="address_contact_id" groups="base.group_extended"/>
+                            <field name="user_id"/>
                             <field name="move_id"/>
                             <separator colspan="4" string="Additional Information"/>
                             <field colspan="4" name="comment" nolabel="1"/>
@@ -487,20 +488,5 @@
 
         <act_window domain="[('partner_id', '=', partner_id), ('account_id.type', 'in', ['receivable', 'payable']), ('reconcile_id','=',False)]" id="act_account_invoice_account_move_unreconciled" name="Unreconciled Receivables &amp; Payables" res_model="account.move.line" src_model="account.invoice"/>
 
-        <!--  Partners inherited form -->
-
-        <record id="view_invoice_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.invoice.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <notebook position="inside">
-                    <page string="Account Info">
-                        <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
-                    </page>
-                </notebook>
-            </field>
-        </record>
     </data>
 </openerp>

addons/account/account_move_line.py

@@ -498,9 +498,17 @@ class account_move_line(osv.osv):
                 return False
         return True
 
+    def _check_company_id(self, cr, uid, ids):
+        lines = self.browse(cr, uid, ids)
+        for l in lines:
+            if l.company_id != l.account_id.company_id or l.company_id != l.period_id.company_id:
+                return False
+        return True
+
     _constraints = [
         (_check_no_view, 'You can not create move line on view account.', ['account_id']),
         (_check_no_closed, 'You can not create move line on closed account.', ['account_id']),
+        (_check_company_id,'Company must be same for its related account and period.',['company_id'] ),
     ]
 
     #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id
@@ -569,11 +577,21 @@ class account_move_line(osv.osv):
     # writeoff; entry generated for the difference between the lines
     #
 
-    def reconcile_partial(self, cr, uid, ids, type='auto', context={}):
+    def reconcile_partial(self, cr, uid, ids, type='auto', context=None):
         merges = []
         unmerge = []
         total = 0.0
         merges_rec = []
+
+        company_list = []
+        if context is None:
+            context = {}
+
+        for line in self.browse(cr, uid, ids, context=context):
+            if company_list and not line.company_id.id in company_list:
+                raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+            company_list.append(line.company_id.id)
+
         for line in self.browse(cr, uid, ids, context):
             if line.reconcile_id:
                 raise osv.except_osv(_('Warning'), _('Already Reconciled!'))
@@ -587,6 +605,7 @@ class account_move_line(osv.osv):
             else:
                 unmerge.append(line.id)
                 total += (line.debit or 0.0) - (line.credit or 0.0)
+
         if not total:
             res = self.reconcile(cr, uid, merges+unmerge, context=context)
             return res
@@ -597,13 +616,22 @@ class account_move_line(osv.osv):
         self.pool.get('account.move.reconcile').reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
         return True
 
-    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context={}):
+    def reconcile(self, cr, uid, ids, type='auto', writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False, context=None):
         lines = self.browse(cr, uid, ids, context=context)
         unrec_lines = filter(lambda x: not x['reconcile_id'], lines)
         credit = debit = 0.0
         currency = 0.0
         account_id = False
         partner_id = False
+        if context is None:
+            context = {}
+
+        company_list = []
+        for line in self.browse(cr, uid, ids, context=context):
+            if company_list and not line.company_id.id in company_list:
+                raise osv.except_osv(_('Warning !'), _('To reconcile the entries company should be the same for all entries'))
+            company_list.append(line.company_id.id)
+
         for line in unrec_lines:
             if line.state <> 'valid':
                 raise osv.except_osv(_('Error'),
@@ -836,7 +864,7 @@ class account_move_line(osv.osv):
         if vals.get('date', False):
             todo_date = vals['date']
             del vals['date']
-            
+
         for line in self.browse(cr, uid, ids,context=context):
             ctx = context.copy()
             if ('journal_id' not in ctx):
@@ -848,8 +876,8 @@ class account_move_line(osv.osv):
                 if line.move_id:
                     ctx['period_id'] = line.move_id.period_id.id
                 else:
-                    ctx['period_id'] = line.period_id.id  
-            #Check for centralisation  
+                    ctx['period_id'] = line.period_id.id
+            #Check for centralisation
             journal = self.pool.get('account.journal').browse(cr, uid, ctx['journal_id'], context=ctx)
             if journal.centralisation:
                 self._check_moves(cr, uid, context=ctx)

addons/account/account_view.xml

@@ -272,22 +272,19 @@
                     <group colspan="4" col="6">
                         <field name="name" select="1"/>
                         <field name="code" select="1"/>
-                        <field name="active" select="1"/>
-                        <field name="type"/>
+                        <field name="type" on_change="onchange_type(type)"/>
                         <field name="refund_journal" attrs="{'readonly':[('type','=','general'),('type','=','cash'),('type','=','situation')]}"/>
                     </group>
-
-                    <notebook colspan="4">
+					    <notebook colspan="4">
                         <page string="General Information">
                             <group colspan="2" col="2">
                                 <separator string="Journal View" colspan="4"/>
-                                <field name="view_id"/>
+                                <field name="view_id" widget="selection"/>
                             </group>
 
                             <group colspan="2" col="2">
                                 <separator string="Sequence" colspan="4"/>
                                 <field name="sequence_id"/>
-                                <field name="invoice_sequence_id"/>
                             </group>
 
                             <group colspan="2" col="2">
@@ -296,7 +293,7 @@
                                 <field name="default_credit_account_id" attrs="{'required':[('type','=','cash')]}" domain="[('type','&lt;&gt;','view'),('type','&lt;&gt;','consolidation')]"/>
                             </group>
 
-                            <group colspan="2" col="2">
+							<group colspan="2" col="2">
                                 <separator string="Validations" colspan="4"/>
                                 <field name="allow_date" groups="base.group_extended"/>
                             </group>
@@ -307,15 +304,19 @@
                                 <field name="user_id" groups="base.group_extended"/>
                                 <field name="currency"/>
                             </group>
+
                             <group colspan="2" col="2">
                                 <separator string="Other Configuration" colspan="4"/>
-                                <field name="centralisation"/>
-                                <field name="group_invoice_lines"/>
-                                <field name="update_posted"/>
+                                <field name="centralisation" groups="base.group_extended"/>
                                 <field name="entry_posted"/>
+	                            <group colspan="2" col="2">
+	                                <separator string="Invoicing Data" colspan="4"/>
+	                                <field name="invoice_sequence_id"/>
+	                                <field name="group_invoice_lines"/>
+	                            </group>
                             </group>
                         </page>
-                        <page string="Entry Controls">
+                        <page string="Entry Controls" groups="base.group_extended">
                             <separator colspan="4" string="Accounts Type Allowed (empty for no control)"/>
                             <field colspan="4" name="type_control_ids" nolabel="1"/>
                             <separator colspan="4" string="Accounts Allowed (empty for no control)"/>
@@ -957,7 +958,6 @@
                             <field name="state" select="1"/>
                             <group col="2" colspan="2">
                                 <button name="button_validate" states="draft" string="Validate" type="object" icon="gtk-execute"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                         <page string="Other Information">
@@ -1006,7 +1006,7 @@
             <field name="view_id" ref="view_move_tree"/>
             <field name="search_view_id" ref="view_account_move_filter"/>
         </record>
-        
+
         <record id="action_move_to_review" model="ir.actions.act_window">
             <field name="name">Journal Entries to Review</field>
             <field name="type">ir.actions.act_window</field>
@@ -1017,8 +1017,8 @@
             <field name="domain">[('to_check','=',True)]</field>
         </record>
         <menuitem action="action_move_to_review" id="menu_action_move_to_review" parent="periodical_processing_journal_entries_validation"/>
-<!--        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>-->
-<!--        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>-->
+        <menuitem id="next_id_29" name="Search Entries" parent="account.menu_finance_entries" sequence="40"/>
+        <menuitem action="action_move_line_form" id="menu_action_move_line_form" parent="next_id_29"/>
 
         <record id="action_move_line_form_encode_by_move" model="ir.actions.act_window">
             <field name="name">Journal Entries</field>
@@ -1030,7 +1030,7 @@
         </record>
 
         <menuitem action="action_move_line_form_encode_by_move" id="menu_encode_entries_by_move" parent="menu_finance_entries"/>
-        
+
         <record id="action_account_moves_sale" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move</field>
@@ -1042,7 +1042,7 @@
         </record>
 
         <menuitem action="action_account_moves_sale" id="menu_eaction_account_moves_sale" parent="menu_finance_receivables"/>
-        
+
         <record id="action_account_moves_purchase" model="ir.actions.act_window">
             <field name="name">Transaction Journals</field>
             <field name="res_model">account.move</field>
@@ -1097,8 +1097,8 @@
         </record>
         <menuitem action="action_move_line_search_view3" id="journal_cash_move_lines" parent="menu_finance_bank_and_cash"/>
         <menuitem action="action_move_line_search_view4" id="journal_bank_move_lines" parent="menu_finance_bank_and_cash"/>
-        
-<!--        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>-->
+
+        <menuitem action="action_move_line_search" id="menu_action_move_line_search" parent="account.next_id_29"/>
 
         <menuitem id="menu_finance_charts" name="Charts" parent="account.menu_finance" sequence="4"/>
     <!--    <wizard id="wizard_account_chart" menu="False" model="account.account" name="account.chart" string="Chart of Accounts"/>
@@ -1554,7 +1554,7 @@
 
         <act_window domain="[('partner_id', '=', active_id), ('account_id.type', 'in', ['receivable', 'payable'])]" id="act_account_partner_account_move_all" name="Receivables &amp; Payables" res_model="account.move.line" src_model="res.partner"/>
 
-		<act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
+        <act_window domain="[('partner_id', '=', active_id)]" id="act_account_partner_account_move" name="All Account Entries" res_model="account.move.line" src_model="res.partner"/>
 
         <record id="view_account_addtmpl_wizard_form" model="ir.ui.view">
             <field name="name">Account Add wizard</field>
@@ -1577,7 +1577,7 @@
             res_model="account.addtmpl.wizard"
             context="{'tmpl_ids': active_id}"
             src_model="account.account.template"
-	    view_type="form" view_mode="form"/>
+            view_type="form" view_mode="form"/>
 
         <!-- Account Templates -->
         <menuitem
@@ -1820,17 +1820,17 @@
                   <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
                 </form>
                 <separator string="title" position="attributes">
-            	<attribute name="string"
+                <attribute name="string"
                        >Generate Chart of Accounts from a Chart Template</attribute>
-          		</separator>
-          		<xpath expr="//label[@string='description']" position="attributes">
-            		<attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
-            		<attribute name="width">150</attribute>
-          		</xpath>
-          		<xpath expr='//separator[@string="vsep"]' position='attributes'>
-              			<attribute name='rowspan'>15</attribute>
-              			<attribute name='string'></attribute>
-	      		</xpath>
+                  </separator>
+                  <xpath expr="//label[@string='description']" position="attributes">
+                    <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
+                    <attribute name="width">150</attribute>
+                  </xpath>
+                  <xpath expr='//separator[@string="vsep"]' position='attributes'>
+                          <attribute name='rowspan'>15</attribute>
+                          <attribute name='string'></attribute>
+                  </xpath>
                 <group string="res_config_contents" position="replace">
                   <field name="company_id"  widget="selection"
                          />
@@ -1851,7 +1851,6 @@
                     </tree>
                   </field>
                 </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
               </data>
             </field>
         </record>

addons/account/board_account_demo.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
         <!--
 			Administrator shortcut
 			Demo user startup menu

addons/account/board_account_view.xml

@@ -6,13 +6,6 @@
             <field name="name">Accountants</field>
         </record>
 
-        <record id="action_account_analytic_line_to_invoice" model="ir.actions.act_window">
-            <field name="name">Costs to invoice</field>
-            <field name="res_model">report.account.analytic.line.to.invoice</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">graph,tree</field>
-        </record>
-
         <record id="action_aged_receivable" model="ir.actions.act_window">
             <field name="name">Receivable Accounts</field>
             <field name="res_model">report.account.receivable</field>
@@ -28,9 +21,6 @@
             <field name="domain">[('type','=','income')]</field>
         </record>
 
-
-        <act_window domain="[('state','&lt;&gt;','close'),('partner_id','&lt;&gt;',False),('to_invoice', '&lt;&gt;', False)]" id="act_my_account" name="Accounts to invoice" res_model="account.analytic.account" src_model="res.users" view_mode="tree,form" view_type="form"/>
-
         <record id="board_account_form" model="ir.ui.view">
             <field name="name">board.account.form</field>
             <field name="model">board.board</field>
@@ -38,25 +28,12 @@
             <field name="arch" type="xml">
                 <form string="Account Board">
                     <hpaned>
-
                         <child1>
-
-                            <action colspan="4" height="160" name="%(hr_timesheet_invoice.action_analytic_account_tree)d" string="Analytic accounts to close" width="510"/>
-
-                            <action colspan="4" height="160" name="%(act_my_account)d" string="Accounts to invoice" width="510"/>
-
                             <action colspan="4" height="160" name="%(account.action_invoice_tree1)d" string="Draft Customer Invoices" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                         </child1>
-
                         <child2>
-                            <button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
-
-                            <action colspan="4" height="220" name="%(action_account_analytic_line_to_invoice)d" string="Costs to invoice"/>
-
                             <action colspan="4" height="220" name="%(action_aged_receivable)d" string="Aged receivables"/>
-
                             <action colspan="4" height="220" name="%(action_aged_income)d" string="Aged income"/>
-
                         </child2>
                     </hpaned>
                 </form>
@@ -71,6 +48,7 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_account_form"/>
         </record>
+        
         <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
         <menuitem id="next_id_68" name="Accounting" parent="base.dashboard"
             groups="account.group_account_manager"/>

addons/account/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/de.po

@@ -7,13 +7,13 @@ 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: 2010-06-03 20:09+0000\n"
+"PO-Revision-Date: 2010-06-09 15:10+0000\n"
 "Last-Translator: Ferdinand @ ChriCar <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-06-04 03:45+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4904,7 +4904,7 @@ msgstr "Details Finanzkonto"
 #. module: account
 #: rml:account.overdue:0
 msgid "VAT:"
-msgstr "USt.:"
+msgstr "UID:"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0

addons/account/i18n/it.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account

addons/account/i18n/zh_CN.po

@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.6\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-29 11:45+0000\n"
-"Last-Translator: digitalsatori <Unknown>\n"
+"PO-Revision-Date: 2010-06-09 16:41+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-30 03:44+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -712,7 +712,7 @@ msgstr "客户欠款金额合计"
 #. module: account
 #: view:account.move.line:0
 msgid "St."
-msgstr ""
+msgstr "结单编码"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_line_open

addons/account/invoice.py

@@ -923,13 +923,13 @@ class account_invoice(osv.osv):
         account_move_obj = self.pool.get('account.move')
         invoices = self.read(cr, uid, ids, ['move_id', 'payment_ids'])
         for i in invoices:
-            if i['move_id']:
+             if i['move_id']:
                 account_move_obj.button_cancel(cr, uid, [i['move_id'][0]])
                 # delete the move this invoice was pointing to
                 # Note that the corresponding move_lines and move_reconciles
                 # will be automatically deleted too
                 account_move_obj.unlink(cr, uid, [i['move_id'][0]])
-            if i['payment_ids']:
+             if i['payment_ids']:
                 account_move_line_obj = self.pool.get('account.move.line')
                 pay_ids = account_move_line_obj.browse(cr, uid , i['payment_ids'])
                 for move_line in pay_ids:
@@ -1300,7 +1300,7 @@ class account_invoice_line(osv.osv):
             result['name'] = res.partner_ref
 
         domain = {}
-        result['uos_id'] = uom or res.uom_id.id or False
+        result['uos_id'] = res.uom_id.id or uom or False
         if result['uos_id']:
             res2 = res.uom_id.category_id.id
             if res2 :
@@ -1323,8 +1323,22 @@ class account_invoice_line(osv.osv):
         if company.currency_id.id != currency.id:
             new_price = res_final['value']['price_unit'] * currency.rate
             res_final['value']['price_unit'] = new_price
+
+        if uom:
+            uom = self.pool.get('product.uom').browse(cr, uid, uom, context=context)
+            if res.uom_id.category_id.id == uom.category_id.id:
+                new_price = res_final['value']['price_unit'] * uom.factor_inv
+                res_final['value']['price_unit'] = new_price
         return res_final
 
+    def uos_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):
+        res = self.product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
+        if 'uos_id' in res['value']:
+            del res['value']['uos_id']
+        if not uom:
+            res['value']['price_unit'] = 0.0
+        return res
+
     def move_line_get(self, cr, uid, invoice_id, context=None):
         res = []
         tax_grouped = {}

addons/account/partner.py

@@ -89,7 +89,7 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _description = 'Partner'
     def _credit_debit_get(self, cr, uid, ids, field_names, arg, context):
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        query = self.pool.get('account.move.line')._query_get(cr, 1, context=context)
         cr.execute("""select
                 l.partner_id, a.type, sum(l.debit-l.credit)
             from

addons/account/partner_view.xml

@@ -118,7 +118,6 @@
                             <field name="acc_number"/>
                         </tree>
                     </field>
-                    <field name="invoice_ids" colspan="4" nolabel="1" context="{'group_by':'product_id'}"/>
                 </page>
                 </notebook>
             </field>
@@ -126,21 +125,14 @@
         
         <!--  Partners info tab view-->
 
-        <record id="view_account_partner_info_form" model="ir.ui.view">
-            <field name="name">res.partner.account.info.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//notebook[last()]" position="after">
-	                <notebook colspan="4">
-	                    <page string="Project">
-	                        <field name="contract_ids" colspan="4" nolabel="1" />
-	                    </page>
-	                </notebook>
-                </xpath>
-            </field>
-        </record>
-        
+        <act_window 
+            id="action_analytic_open"
+            name="Analytic Accounts"
+            res_model="account.analytic.account"
+            domain="[('partner_id','=',active_id)]"
+            src_model="res.partner"
+            view_type="form"
+            view_mode="tree,form,graph,calendar"/>
+
     </data>
 </openerp>

addons/account/project/project.py

@@ -46,7 +46,7 @@ class account_journal(osv.osv):
     _inherit="account.journal"
 
     _columns = {
-        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal'),
+        'analytic_journal_id':fields.many2one('account.analytic.journal','Analytic Journal',help="Journal for analytic entries"),
     }
 account_journal()
 

addons/account/project/project_view.xml

@@ -312,23 +312,23 @@
             <field name="domain">[('journal_id','=',active_id)]</field>
         </record>
         <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_entries"/>
-        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+        <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
             <field name="name">Check Register</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('journal_id','=',active_id)]</field>
-        </record>
+        </record> -->
 <!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
-        <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
+         <!-- <record id="action_account_analytic_journal_open_form" model="ir.actions.act_window">
             <field name="name">Checks Register</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('journal_id','=',active_id)]</field>
-        </record>
+        </record> -->
 <!--        <menuitem action="action_account_analytic_journal_open_form" id="account_analytic_journal_entries" parent="menu_finance_bank_and_cash"/>-->
-        
+
 <!--        <record id="ir_open_account_journal_analytic" model="ir.values">-->
 <!--            <field eval="'tree_but_open'" name="key2"/>-->
 <!--            <field eval="'account.analytic.journal'" name="model"/>-->

addons/account/project/wizard/account_analytic_cost_ledger_for_journal_report.py

@@ -55,51 +55,3 @@ class account_analytic_cost_ledger_journal_report(osv.osv_memory):
 
 account_analytic_cost_ledger_journal_report()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
-#import time
-#import wizard
-#
-#_form = '''<?xml version="1.0"?>
-#<form string="Select period">
-#    <separator string="Cost Legder for period" colspan="4"/>
-#    <field name="date1"/>
-#    <field name="date2"/>
-#    <separator string="and Journals" colspan="4"/>
-#    <field name="journal" colspan="4"/>
-#</form>'''
-#
-#_fields = {
-#    'date1': {'string':'Start of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-01-01')},
-#    'date2': {'string':'End of period', 'type':'date', 'required':True, 'default': lambda *a: time.strftime('%Y-%m-%d')},
-#    'journal': {'string':'Journals','type':'many2many', 'relation':'account.analytic.journal'},
-#}
-#
-#
-#class wizard_report(wizard.interface):
-#    states = {
-#        'init': {
-#            'actions': [],
-#            'result': {
-#                'type': 'form',
-#                'arch': _form,
-#                'fields': _fields,
-#                'state': [
-#                    ('end','Cancel'),
-#                    ('report','Print')
-#                ]
-#            }
-#        },
-#        'report': {
-#            'actions': [],
-#            'result': {
-#                'type': 'print',
-#                'report': 'account.analytic.account.quantity_cost_ledger',
-#                'state': 'end'
-#            }
-#        },
-#    }
-#
-#wizard_report('account.analytic.account.quantity_cost_ledger.report')
-#
-## vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/account/project/wizard/project_account_analytic_line.py

@@ -32,26 +32,26 @@ class project_account_analytic_line(osv.osv_memory):
      def action_open_window(self, cr, uid, ids, context={}):
           mod_obj =self.pool.get('ir.model.data')
           domain = []
-          for data in self.read(cr, uid, ids, context=context):
-              from_date = data['from_date']
-              to_date = data['to_date']
-              if from_date and to_date:
-                    domain = [('date','>=',from_date), ('date','<=',to_date)]
-              elif from_date:
-                    domain = [('date','>=',from_date)]
-              elif to_date:
-                    domain = [('date','<=',to_date)]
-              result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
-              id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
-              return {
-                    'name': _('Analytic Entries by line'),
-                    'view_type': 'form',
-                    "view_mode": 'tree,form',
-                    'res_model': 'account.analytic.line',
-                    'type': 'ir.actions.act_window',
-                    'domain': domain,
-                    'search_view_id': id['res_id'],
-                    }
+          data = self.read(cr, uid, ids, [])[0]
+          from_date = data['from_date']
+          to_date = data['to_date']
+          if from_date and to_date:
+                domain = [('date','>=',from_date), ('date','<=',to_date)]
+          elif from_date:
+                domain = [('date','>=',from_date)]
+          elif to_date:
+                domain = [('date','<=',to_date)]
+          result = mod_obj._get_id(cr, uid, 'account', 'view_account_analytic_line_filter')
+          id = mod_obj.read(cr, uid, result, ['res_id'], context=context)
+          return {
+                'name': _('Analytic Entries by line'),
+                'view_type': 'form',
+                "view_mode": 'tree,form',
+                'res_model': 'account.analytic.line',
+                'type': 'ir.actions.act_window',
+                'domain': domain,
+                'search_view_id': id['res_id'],
+                }
 
 project_account_analytic_line()
 

addons/account/security/account_security.xml

@@ -44,77 +44,77 @@
     </record>
 
     <record id="account_move_line_comp_rule" model="ir.rule">
-    	 <field name="name">Entry lines</field>
+         <field name="name">Entry lines</field>
         <field model="ir.model" name="model_id" ref="model_account_move_line"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_period_comp_rule" model="ir.rule">
-    	<field name="name">Journal Period</field>
+        <field name="name">Journal Period</field>
         <field model="ir.model" name="model_id" ref="model_account_journal_period"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="journal_comp_rule" model="ir.rule">
-    	<field name="name">Journal multi-company</field>
+        <field name="name">Journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_journal"/>
         <field eval="True" name="global"/>
-        <field name="domain_force">['|','|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule" model="ir.rule">
-    	<field name="name">Analytic journal multi-company</field>
+        <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="analytic_journal_comp_rule_false" model="ir.rule">
-    	<field name="name">Analytic journal multi-company</field>
+        <field name="name">Analytic journal multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_analytic_journal"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="period_comp_rule" model="ir.rule">
-    	<field name="name">Period multi-company</field>
+        <field name="name">Period multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_period"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="fiscal_year_comp_rule" model="ir.rule">
-    	<field name="name">Fiscal year multi-company</field>
+        <field name="name">Fiscal year multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_fiscalyear"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="account_comp_rule" model="ir.rule">
-		<field name="name">Account multi-company</field>
+        <field name="name">Account multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_account"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_comp_rule" model="ir.rule">
-    	 <field name="name">Tax multi-company</field>
+         <field name="name">Tax multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="tax_code_comp_rule" model="ir.rule">
-    	<field name="name">Tax code multi-company</field>
+        <field name="name">Tax code multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_tax_code"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
     </record>
 
     <record id="invoice_comp_rule" model="ir.rule">
-    	<field name="name">Invoice multi-company</field>
+        <field name="name">Invoice multi-company</field>
         <field model="ir.model" name="model_id" ref="model_account_invoice"/>
         <field eval="True" name="global"/>
         <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>

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

@@ -1,4 +1,5 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_product_product_account_user","product.product.account.user","product.model_product_product","group_account_user",1,0,0,0
 "access_account_payment_term","account.payment.term","model_account_payment_term","account.group_account_user",1,0,0,0
 "access_account_payment_term_line","account.payment.term.line","model_account_payment_term_line","account.group_account_user",1,0,0,0
 "access_account_account_type","account.account.type","model_account_account_type","account.group_account_user",1,0,0,0
@@ -69,7 +70,6 @@
 "access_account_add_tmpl_wizard_system_manager","account.addtmpl.wizard system manager","model_account_addtmpl_wizard","base.group_system",1,1,1,1
 "access_account_invoice_user","account.invoice user","model_account_invoice","base.group_user",1,0,0,0
 "access_account_invoice_user","account.invoice.line user","model_account_invoice_line","base.group_user",1,0,0,0
-"access_account_invoice_user","account.invoice.tax user","model_account_invoice_tax","base.group_user",1,0,0,0
 "access_account_payment_term_partner_manager","account.payment.term partner manager","model_account_payment_term","base.group_user",1,0,0,0
 "access_account_payment_term_line_partner_manager","account.payment.term.line partner manager","model_account_payment_term_line","base.group_user",1,0,0,0
 "access_account_account_product_manager","account.account product manager","model_account_account","product.group_product_manager",1,0,0,0
@@ -85,7 +85,7 @@
 "access_account_fiscal_position_account_template","account.fiscal.position.account.template","model_account_fiscal_position_account_template","account.group_account_manager",1,1,1,1
 "access_account_sequence_fiscal_year","account.sequence.fiscalyear","model_account_sequence_fiscalyear","account.group_account_user",1,1,1,1
 "access_account_sequence_fiscal_year_user","account.sequence.fiscalyear user","model_account_sequence_fiscalyear","base.group_user",1,0,0,0
-"access_account_installer","account.installer","model_account_installer","base.group_user",1,0,0,0
+"access_account_installer","account.installer","model_account_installer","base.group_system",1,1,1,1
 "access_report_account_receivable","report.account.receivable","model_report_account_receivable","account.group_account_manager",1,0,0,0
 "access_temp_range","temp.range","model_temp_range","account.group_account_manager",1,0,0,0
 "access_report_aged_receivable","report.aged.receivable","model_report_aged_receivable","account.group_account_manager",1,0,0,0

addons/account/test/account_change_currency.yml

@@ -0,0 +1,84 @@
+-
+  In order to test change currency wizard I create an invoice with currency "EUR" and change it to "USD" using the wizard
+-
+  !record {model: account.invoice, id: account_invoice_currency}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    reference_type: none
+
+-
+  I check that Initially customer invoice is in the draft state
+-
+  !assert {model: account.invoice, id: account_invoice_currency, string: Customer Invoice is in Draft state}:
+    - state == 'draft'
+-
+  I change the state of invoice to proforma2 by clicking PRO-FORMA button
+-
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_currency}
+-
+  I check that now customer invoice is in the "proforma2" state
+-
+  !assert {model: account.invoice, id: account_invoice_currency}:
+    - state == 'proforma2'
+-
+  Now I select USD as new currency
+-
+  !record {model: account.change.currency, id: account_change_currency_0}:
+    currency_id: base.USD
+-
+  I clicked on Change Currency button to change the currency
+-
+  !python {model: account.change.currency}: |
+    try:
+       self.view_init(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+      })
+       self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+      })
+    except:
+       print "You can not change currency for Open Invoice !"
+-
+  I can't change the currency of invoice when it is not in draft state so i change the state to cancel
+-
+  !workflow {model: account.invoice, action: invoice_cancel, ref: account_invoice_currency}
+-
+  I change the state to "Draft"
+-
+  !python {model: account.invoice}: |
+    self.action_cancel_draft(cr, uid, [ref("account_invoice_currency")], {"lang": 'en_US',
+      "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
+      "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
+      })
+-
+  I change the currency.
+-
+  !record {model: account.change.currency, id: account_change_currency_0}:
+    currency_id: base.USD
+-
+  I clicked on Change Currency button to change the currency
+-
+  !python {model: account.change.currency}: |
+    self.change_currency(cr, uid, [ref("account_change_currency_0")], {"lang": 'en_US',
+      "active_model": "account.invoice", "tz": False, "record_id": 4, "active_ids":
+      [ref("account_invoice_currency")], "type": "out_invoice", "active_id": ref("account_invoice_currency"),
+      })
+-
+  I check that the currency is changed successfully
+-
+  !assert {model: account.invoice, id: account_invoice_currency, string: Currency changed from EUR to USD}:
+    - currency_id.id == ref("base.USD")

addons/account/test/account_customer_invoice.yml

@@ -1,9 +1,7 @@
 -
-  In order to test account invoice i create a new customer invoice
+  In order to test account invoice I create a new customer invoice
 -
-  Creating a account.invoice record
--
-  !record {model: account.invoice, id: account_invoice_0}:
+  !record {model: account.invoice, id: account_invoice_customer0}:
     account_id: account.a_recv
     address_contact_id: base.res_partner_address_zen
     address_invoice_id: base.res_partner_address_zen
@@ -21,36 +19,30 @@
     partner_id: base.res_partner_3
     reference_type: none
 -
-  I check that Initially customer invoice is in the draft state
+  I check that Initially customer invoice is in the "Draft" state
 -
-  !assert {model: account.invoice, id: account_invoice_0}:
+  !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'draft'
 -
-  I change the state of invoice to proforma2 by clicking PRO-FORMA button
+  I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
 -
-  Performing a workflow action invoice_proforma2 on module account.invoice
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_customer0}
 -
-  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_0}
+  I check that the invoice state is now "Proforma2"
 -
-  I check that the invoice state is now proforma2
--
-  !assert {model: account.invoice, id: account_invoice_0}:
+  !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'proforma2'
 -
   I create invoice by clicking on Create button
 -
-  Performing a workflow action invoice_open on module account.invoice
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_customer0}
 -
-  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_0}
+  I check that the invoice state is "Open"
 -
-  I check that the invoice state is now open
--
-  !assert {model: account.invoice, id: account_invoice_0}:
+  !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
 -
-  I make a partial payment of 1000 by clicking on Pay Invoice button
--
-  Creating a account.invoice.pay record
+  I create a record for partial payment of 1000 EUR.
 -
   !record {model: account.invoice.pay, id: account_invoice_pay_first0}:
     amount: 1000.0
@@ -58,25 +50,21 @@
     journal_id: account.sales_journal
     name: First payment for [PC3] Medium PC to Distrib PC
     period_id: account.period_5
-
-
 -
-  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+  I make partial payment by clicking on Partial Payment button
 -
   !python {model: account.invoice.pay}: |
     self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang":
       'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
       })
 -
   I check that the invoice state is still open
 -
-  !assert {model: account.invoice, id: account_invoice_0}:
+  !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'open'
 -
-  I make second partial payment of 6000 by clicking on Pay Invoice button
--
-  Creating a account.invoice.pay record
+  I make second partial payment of 6000 EUR.
 -
   !record {model: account.invoice.pay, id: account_invoice_pay_second0}:
     amount: 6000.0
@@ -84,19 +72,17 @@
     journal_id: account.sales_journal
     name: Second payment for [PC3] Medium PC to Distrib PC
     period_id: account.period_5
-
 -
-  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+  I make partial payment by clicking on Partial Payment button
+
 -
   !python {model: account.invoice.pay}: |
     self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang":
       'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
       })
 -
-  I make final partial payment of 2000 by clicking on Pay Invoice button
--
-  Creating a account.invoice.pay record
+  I make final partial payment of 2000 EUR
 -
   !record {model: account.invoice.pay, id: account_invoice_pay_final0}:
     amount: 2000.0
@@ -105,39 +91,39 @@
     name: Final payment for [PC3] Medium PC to Distrib PC
     period_id: account.period_5
 
-
 -
-  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+  I make partial payment by clicking on Partial Payment button
+
 -
   !python {model: account.invoice.pay}: |
     self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang":
       'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
-      [ref("account_invoice_0")], "type": "out_invoice", "active_id": ref("account_invoice_0"),
+      [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
       })
 
 -
   I check that the invoice state is now Done
 -
-  !assert {model: account.invoice, id: account_invoice_0}:
+  !assert {model: account.invoice, id: account_invoice_customer0}:
     - state == 'paid'
 -
   I check that an payment entry gets created in the account.move.line
 -
   !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("account_invoice_0"))
+    acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
     assert(acc_id.move_id)
-#-
-#  I refund the invoice
-#-
-#  Creating a account.invoice.refund record
-#-
-#  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
-#    description: Refund
-#
-#-
-#  Performing an osv_memory action invoice_refund on module account.invoice.refund
-#-
-#  !python {model: account.invoice.refund}: |
-#    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
-#    return self.compute_refund(cr, uid, [ref("account_invoice_refund_0")], "refund" {"lang": 'en_US',"tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_0")], "type": "out_invoice", "active_id": ref("account.account_invoice_0"), })
+-
+  I refund the invoice Using Credit Note
+-
+  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
+    description: Refund To China Export
+    period: account.period_5
+-
+  I clicked on refund button
+-
+  !python {model: account.invoice.refund}: |
+    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US', "tz": False, "active_model": "account.invoice", "active_ids": [ref("account.account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account.account_invoice_customer0"), })
+-
+  I checked that a new entry with state "Draft" created in account move line
+
 

addons/account/test/account_fiscalyear_close.yml

@@ -0,0 +1,91 @@
+-
+  In order to test Generate Fiscalyear Opening Entries wizard of OpenERP I first create a fiscalyear "Fiscal Year 2011" to which the entries will move
+-
+  !record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
+    code: FY2011
+    company_id: base.main_company
+    date_start: '2011-01-01'
+    date_stop: '2011-12-31'
+    name: Fiscal Year 2011
+-
+  I create a period "Jan2011" for the new fiscalyear
+-
+  !record {model: account.period, id: account_period_jan11}:
+    company_id: base.main_company
+    date_start: '2011-01-01'
+    date_stop: '2011-12-31'
+    fiscalyear_id: account_fiscalyear_fiscalyear0
+    name: Jan2011
+    special: 1
+
+-
+  I made modification in journal so it can move entries
+-
+  !record {model: account.journal, id: account.sales_journal}:
+    centralisation: 1
+
+-
+  I called the Generate Fiscalyear Opening Entries wizard
+-
+  !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}:
+    fy2_id: account_fiscalyear_fiscalyear0
+    fy_id: account.data_fiscalyear
+    journal_id: account.sales_journal
+    period_id: account_period_jan11
+    report_name: End of Fiscal Year Entry
+    sure: 1
+-
+  I clicked on create Button
+
+-
+  !python {model: account.fiscalyear.close}: |
+    self.data_save(cr, uid, [ref("account_fiscalyear_close_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close")],
+      "tz": False, "active_id": ref("account.menu_wizard_fy_close"), })
+
+-
+  I check the opening entries By using "Entries by Line wizard"
+-
+  !record {model: account.move.journal, id: account_move_journal_0}:
+    journal_id: account.sales_journal
+    period_id: account_period_jan11
+-
+  I clicked on Open Journal Button to check the entries
+
+-
+  !python {model: account.move.journal}: |
+    self.action_open_window(cr, uid, [ref("account_move_journal_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
+      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
+      })
+
+-
+  In order to test Cancel Opening Entries I cancelled the opening entries created for "Fiscal Year 2011"
+-
+  !record {model: account.open.closed.fiscalyear, id: account_open_closed_fiscalyear_1}:
+    fyear_id: account.data_fiscalyear
+-
+  I clicked on Open button
+-
+  !python {model: account.open.closed.fiscalyear}: |
+    self.remove_entries(cr, uid, [ref("account_open_closed_fiscalyear_1")], {"lang":
+      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_open_closed_fy")],
+      "tz": False, "active_id": ref("account.menu_wizard_open_closed_fy"), })
+-
+  I check the opening entries By using "Entries by Line wizard"
+-
+  !record {model: account.move.journal, id: account_move_journal_2}:
+    journal_id: account.sales_journal
+    period_id: account_period_jan11
+
+-
+  I checked the Opening entries are cancelled successfully
+-
+  !python {model: account.move.journal}: |
+    self.action_open_window(cr, uid, [ref("account_move_journal_2")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_move_journal_line_form")],
+      "tz": False, "active_id": ref("account.menu_action_move_journal_line_form"),
+      })
+
+
+

addons/account/test/account_fiscalyear_close_state.yml

@@ -0,0 +1,46 @@
+
+-
+  In order to check the Close a Fiscal Year wizard in OpenERP I first create a Fiscalyear
+-
+  !record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}:
+    code: FY2011
+    company_id: base.main_company
+    date_start: '2011-01-01'
+    date_stop: '2011-12-31'
+    name: Fiscal Year 2011
+-
+  I create monthly Periods for this fiscalyear
+-
+  !python {model: account.fiscalyear}: |
+    self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")], {"lang":
+      'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_fiscalyear_form")],
+      "tz": False, "active_id": ref("account.menu_action_account_fiscalyear_form"),
+      })
+-
+  I check that the fiscalyear state is "Draft"
+-
+  !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Draft state}:
+    - state == 'draft'
+-
+  I run the Close a Fiscalyear wizard to close this fiscalyear
+-
+  !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}:
+    fy_id: account_fiscalyear_fiscalyear0
+    sure: 1
+-
+  I clicked on Close States Button to close fiscalyear
+
+-
+  !python {model: account.fiscalyear.close.state}: |
+    self.data_save(cr, uid, [ref("account_fiscalyear_close_state_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_wizard_fy_close_state")],
+      "tz": False, "active_id": ref("account.menu_wizard_fy_close_state"), })
+-
+  I check that the fiscalyear state is now "Done"
+-
+  !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}:
+    - state == 'done'
+
+
+
+

addons/account/test/account_invoice_state.yml

@@ -0,0 +1,68 @@
+-
+  In order to test Confirm Draft Invoice wizard I create an invoice and confirm it with this wizard
+-
+  !record {model: account.invoice, id: account_invoice_state}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.bank_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    reference_type: none
+-
+  I check that Initially customer invoice state is "Draft"
+-
+  !assert {model: account.invoice, id: account_invoice_state}:
+    - state == 'draft'
+-
+  I called the "Confirm Draft Invoices" wizard
+-
+  !record {model: account.invoice.confirm, id: account_invoice_confirm_0}:
+    {}
+-
+  I clicked on Confirm Invoices Button
+-
+  !python {model: account.invoice.confirm}: |
+    self.invoice_confirm(cr, uid, [ref("account_invoice_confirm_0")], {"lang": 'en_US',
+      "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_state")],
+      "type": "out_invoice", "active_id": ref("account_invoice_state"), })
+-
+  I check that customer invoice state is "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_state}:
+    - state == 'open'
+-
+  I Modified the journal record so it can cancel invoice
+-
+  !record {model: account.journal, id: account.bank_journal}:
+    update_posted: 1
+
+
+-
+  In order to check the "Cancel Selected Invoices" wizard in openerp I cancelled this open invoice using this wizard
+-
+  !record {model: account.invoice.cancel, id: account_invoice_cancel_0}:
+    {}
+
+-
+  I clicked on Cancel Invoices Button
+-
+  !python {model: account.invoice.cancel}: |
+    self.invoice_cancel(cr, uid, [ref("account_invoice_cancel_0")], {"lang": 'en_US',
+      "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_state")],
+      "type": "out_invoice", "active_id": ref("account_invoice_state"), })
+
+-
+  I check that customer invoice is in the cancel state
+-
+  !assert {model: account.invoice, id: account_invoice_state}:
+    - state == 'cancel'
+

addons/account/test/account_period_close.yml

@@ -0,0 +1,35 @@
+
+-
+  In order to test close period wizard I create a period then close it and checked it's state
+-
+  !record {model: account.period, id: account_period_jan0}:
+    company_id: base.main_company
+    date_start: '2010-01-01'
+    date_stop: '2010-01-31'
+    fiscalyear_id: account.data_fiscalyear
+    name: Jan-2010
+    special: 1
+
+-
+  I check that the period state is "Draft"
+-
+  !assert {model: account.period, id: account_period_jan0, string: Period is in Draft state}:
+    - state == 'draft'
+-
+  I use "Close a Period" wizard to close period Jan-2010
+-
+  !record {model: account.period.close, id: account_period_close_0}:
+    sure: 1
+-
+  I clicked on Close Period Button to close Period
+
+-
+  !python {model: account.period.close}: |
+    self.data_save(cr, uid, [ref("account_period_close_0")], {"lang": 'en_US', "active_model":
+      "account.period", "active_ids": [ref("account_period_jan0")], "tz": False, "active_id":
+      ref("account_period_jan0"), })
+-
+  I check that the period state is "Done"
+-
+  !assert {model: account.period, id: account_period_jan0, string: Period is in Done state}:
+    - state == 'done'

addons/account/test/account_supplier_invoice.yml

@@ -1,9 +1,7 @@
 -
-  In order to test account invoice i create a new supplier invoice
+  In order to test account invoice I create a new supplier invoice
 -
-  Creating a account.invoice record
--
-  !record {model: account.invoice, id: account_invoice_1}:
+  !record {model: account.invoice, id: account_invoice_supplier0}:
     account_id: account.a_pay
     address_contact_id: base.res_partner_address_3000
     address_invoice_id: base.res_partner_address_3000
@@ -22,25 +20,21 @@
     reference_type: none
     type: in_invoice
 -
-  I check that Initially supplier invoice is in the draft state
+  I check that Initially supplier invoice state is "Draft"
 -
-  !assert {model: account.invoice, id: account_invoice_1}:
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
     - state == 'draft'
 -
   I change the state of invoice to open by clicking Validate button
 -
-  Performing a workflow action invoice_open on module account.invoice
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_supplier0}
 -
-  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_1}
+  I check that the invoice state is now "Open"
 -
-  I check that the invoice state is now open
--
-  !assert {model: account.invoice, id: account_invoice_1}:
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
     - state == 'open'
 -
-  I make a partial payment of 2000 by clicking on Pay Invoice button
--
-  Creating a account.invoice.pay record
+  I make a partial payment of 2000 EUR
 -
   !record {model: account.invoice.pay, id: account_invoice_pay_firstpaymenttoaxelorforbasicpc0}:
     amount: 2000.0
@@ -48,24 +42,21 @@
     journal_id: account.sales_journal
     name: First Payment to Axelor for Basic PC
     period_id: account.period_5
-
 -
-  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+  I make partial payment by clicking on Partial Payment button
 -
   !python {model: account.invoice.pay}: |
     self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_firstpaymenttoaxelorforbasicpc0")],
       {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
-      25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
-      ref("account_invoice_1"), })
+      25, "active_ids": [ref("account_invoice_supplier0")], "type": "in_invoice", "active_id":
+      ref("account_invoice_supplier0"), })
 -
-  I check that the invoice state is still open
+  I check that the invoice state is still "Open"
 -
-  !assert {model: account.invoice, id: account_invoice_1}:
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
     - state == 'open'
 -
-  I make final partial payment of 1000 by clicking on Pay Invoice button
--
-  Creating a account.invoice.pay record
+  I make final partial payment of 1000 EUR
 -
   !record {model: account.invoice.pay, id: account_invoice_pay_finalpaymenttoaxelorforbasicpc0}:
     amount: 1000.0
@@ -73,45 +64,23 @@
     journal_id: account.sales_journal
     name: Final Payment to Axelor for Basic PC
     period_id: account.period_5
-
-
 -
-  Performing an osv_memory action pay_and_reconcile on module account.invoice.pay
+  I make partial payment by clicking on Partial Payment button
 -
   !python {model: account.invoice.pay}: |
     self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_finalpaymenttoaxelorforbasicpc0")],
       {"lang": 'en_US', "active_model": "account.invoice", "tz": False, "record_id":
-      25, "active_ids": [ref("account_invoice_1")], "type": "in_invoice", "active_id":
-      ref("account_invoice_1"), })
+      25, "active_ids": [ref("account_invoice_supplier0")], "type": "in_invoice", "active_id":
+      ref("account_invoice_supplier0"), })
 
 -
-  I check that the invoice state is now Done
+  I check that the invoice state is now "Done"
 -
-  !assert {model: account.invoice, id: account_invoice_1}:
+  !assert {model: account.invoice, id: account_invoice_supplier0}:
     - state == 'paid'
 -
-  I check that an payment entry gets created in the account.move.line
+  I check that an payment entry gets created in the account move line
 -
   !python {model: account.invoice}: |
-    acc_id=self.browse(cr, uid, ref("account_invoice_1"))
+    acc_id=self.browse(cr, uid, ref("account_invoice_supplier0"))
     assert(acc_id.move_id)
-#-
-#  I refund the invoice
-#-
-#  Creating a account.invoice.refund record
-#-
-#  !record {model: account.invoice.refund, id: account_invoice_refund_0}:
-#    date: '2010-06-22'
-#    description: 'Refund By Axelor '
-#
-#
-#-
-#  Performing an osv_memory action invoice_refund on module account.invoice.refund
-#-
-#  !python {model: account.invoice.refund}: |
-#    self.invoice_refund(cr, uid, [ref("account_invoice_refund_0")], {"lang": 'en_US',
-#      "tz": False, "active_model": "account.invoice", "active_ids": [ref("account_invoice_1")],
-#      "type": "in_invoice", "active_id": ref("account_invoice_1"), })
-
-
-

addons/account/test/account_use_model.yml

@@ -0,0 +1,44 @@
+-
+  In order to test account use models wizard in OpenERP I create an account model record
+-
+  !record {model: account.model, id: account_model_mymodelonyears0}:
+    journal_id: account.expenses_journal
+    lines_id:
+      - account_id: account.a_recv
+        credit: 0.0
+        debit: 0.0
+        name: test1
+        sequence: 0.0
+        date: today
+        quantity: 0.0
+    name: My Model on %(year)s
+
+-
+  I create an account use model record
+
+-
+  !record {model: account.use.model, id: account_use_model_0}:
+    {}
+
+-
+  I create entries.
+-
+  !python {model: account.use.model}: |
+    self.create_entries(cr, uid, [ref("account_use_model_0")], {"lang": 'en_US', "active_model":
+      "account.model", "active_ids": [ref("account_model_mymodelonyears0")], "tz":
+      False, "active_id": ref("account_model_mymodelonyears0"), })
+-
+  I create an account use model record
+-
+  !record {model: account.use.model, id: account_use_model_1}:
+    {}
+
+-
+  I checked that Moves are created successfully
+
+-
+  !python {model: account.use.model}: |
+    self.open_moves(cr, uid, [ref("account_use_model_1")], {"lang": 'en_US', "move_ids":
+      [], "tz": False, "active_model": "account.model", "active_ids": [ref("account_model_mymodelonyears0")],
+      "active_id": ref("account_model_mymodelonyears0"), })
+

addons/account/test/account_validate_account_move.yml

@@ -0,0 +1,60 @@
+-
+  In order to test Validate Ledger Postings wizard in OpenERP I created a account move
+
+-
+  !record {model: account.move, id: account_move_0}:
+    date: '2010-06-07'
+    journal_id: account.bank_journal
+    line_id:
+      - account_id: account.cash
+        amount_currency: 0.0
+        credit: 2000.0
+        date: '2010-06-07'
+        debit: 0.0
+        journal_id: account.bank_journal
+        name: Basic Computer
+        partner_id: base.res_partner_desertic_hispafuentes
+        period_id: account.period_6
+        ref: '2010010'
+        tax_amount: 0.0
+      - journal_id: account.bank_journal
+        period_id: account.period_6
+        ref: '2010010'
+        tax_amount: 0.0
+        account_id: account.a_recv
+        amount_currency: 0.0
+        credit: 0.0
+        date: '2010-06-07'
+        debit: 2000.0
+        name: Basic Computer
+        partner_id: base.res_partner_desertic_hispafuentes
+        quantity: 0.0
+    name: /
+    period_id: account.period_6
+    ref: '2010010'
+    state: draft
+
+-
+  I check that Initially account move state is "Draft"
+-
+  !assert {model: account.move, id: account_move_0}:
+    - state == 'draft'
+-
+  I validate this account move by using Validate Ledger Postings
+-
+  !record {model: validate.account.move, id: validate_account_move_0}:
+    journal_id: account.bank_journal
+    period_id: account.period_6
+-
+  I clicked on validate Button
+-
+  !python {model: validate.account.move}: |
+    self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US",
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")],
+      "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
+
+-
+  I check that the invoice state is now "Posted"
+-
+  !assert {model: account.move, id: account_move_0}:
+    - state == 'posted'

addons/account/test/chart_of_account.yml

@@ -0,0 +1,75 @@
+-
+ In order to check the Chart of Accounts wizard  I run the wizard with target move set as all
+
+-
+  !record {model: account.chart, id: account_chart_0}:
+    target_move: all
+-
+  I clicked on Open chart Button to open the chart
+-
+  !python {model: account.chart}: |
+    self.account_chart_open_window(cr, uid, [ref("account_chart_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_tree2")],
+      "tz": False, "active_id": ref("account.menu_action_account_tree2"), })
+
+-
+  I create chart of account with target move set as posted
+-
+  !record {model: account.chart, id: account_chart_0}:
+    target_move: posted
+-
+  I clicked on Open chart Button to open the chart
+-
+  !python {model: account.chart}: |
+    self.account_chart_open_window(cr, uid, [ref("account_chart_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_account_tree2")],
+      "tz": False, "active_id": ref("account.menu_action_account_tree2"), })
+
+-
+  In order to test Account Move Line Wizard I check the move line entries using this wizard
+-
+  !record {model: account.move.line.select, id: account_move_line_select_0}:
+    {}
+-
+  I clicked on Button to open the account move lines
+-
+  !python {model: account.move.line.select}: |
+    self.open_window(cr, uid, [ref("account_move_line_select_0")], {"lang": 'en_US',
+      "state": "all", "tz": False, "active_model": "account.account", "active_ids":
+      [ref("account.a_recv")], "fiscalyear": 1, "active_id": ref("account.a_recv"),
+      })
+
+
+-
+  In order to test the Analytic Charts of Account wizard I will generate chart
+
+-
+  !record {model: account.analytic.chart, id: account_analytic_chart_0}:
+    from_date: '2010-01-01'
+    to_date: '2010-06-30'
+-
+  I clicked on Open chart Button to open the charts
+
+-
+  !python {model: account.analytic.chart}: |
+    self.analytic_account_chart_open_window(cr, uid, [ref("account_analytic_chart_0")],
+      {"lang": 'en_US', "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_analytic_account_tree2")],
+      "tz": False, "active_id": ref("account.menu_action_analytic_account_tree2"),
+      })
+
+-
+  In order to test Account Journal Select wizard I open journal entries using this wizard
+-
+  !record {model: account.journal.select, id: account_journal_select_0}:
+    {}
+-
+  I clicked on Open Journal Button to open the entries
+
+-
+  !python {model: account.journal.select}: |
+    self.action_open_window(cr, uid, [ref("account_journal_select_0")], {"lang":
+      'en_US', "active_model": "account.journal.period", "active_ids": [ref("account.a_recv")],
+      "tz": False, "active_id": ref("account.a_recv"), })
+-
+  I check that the entries open successfully
+

addons/account/wizard/account_automatic_reconcile.py

@@ -134,7 +134,6 @@ class account_automatic_reconcile(osv.osv_memory):
         return (reconciled, len(credits)+len(debits))
 
     def reconcile(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService("object_proxy")
         move_line_obj = self.pool.get('account.move.line')
         obj_model = self.pool.get('ir.model.data')
         if context is None:
@@ -240,4 +239,4 @@ class account_automatic_reconcile(osv.osv_memory):
 
 account_automatic_reconcile()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/wizard/account_automatic_reconcile_view.xml

@@ -40,7 +40,7 @@
 
  	   <menuitem
  	   		icon="STOCK_EXECUTE"
- 	   		name="Automatic reconciliation"
+ 	   		name="Automatic Reconciliation"
  	   		action="action_account_automatic_reconcile"
  			id="menu_automatic_reconcile"
  			parent="periodical_processing_reconciliation"/>

addons/account/wizard/account_chart_view.xml

@@ -2,27 +2,27 @@
 <openerp>
     <data>
 
-  		<record id="view_account_chart" model="ir.ui.view">
+          <record id="view_account_chart" model="ir.ui.view">
             <field name="name">account.chart.form</field>
             <field name="model">account.chart</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Account charts">
-                	<group colspan="4" >
-                		 <field name="fiscalyear"/>
-              			 <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
-                		 <field name="target_move"/>
+                    <group colspan="4" >
+                         <field name="fiscalyear"/>
+                           <label align="0.7" colspan="6" string="(If you do not select Fiscal year it will take all open fiscal years)"/>
+                         <field name="target_move"/>
                     </group>
-                       	 <separator string="" 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-open" string="Open Charts"
-                    		name="account_chart_open_window" type="object" />
+                           <label string ="" colspan="2"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel" />
+                        <button icon="gtk-open" string="Open Charts"
+                            name="account_chart_open_window" type="object" />
                     </group>
                 </form>
             </field>
-  		</record>
+          </record>
 
         <record id="action_account_chart" model="ir.actions.act_window">
             <field name="name">Chart of Accounts</field>
@@ -34,7 +34,7 @@
         </record>
 
         <menuitem icon="STOCK_INDENT" action="action_account_chart"
-        	id="menu_action_account_tree2"
-        	parent="account.menu_finance_charts" />
+            id="menu_action_account_tree2"
+            parent="account.menu_finance_charts" />
     </data>
-</openerp>
+</openerp>

addons/account/wizard/account_invoice_state.py

@@ -37,11 +37,11 @@ class account_invoice_confirm(osv.osv_memory):
             context = {}
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] not in ('draft','proforma','proforma2'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-Forma' state!"))
-            wf_service.trg_validate(uid, 'account.invoice', id, 'invoice_open', cr)
+            wf_service.trg_validate(uid, 'account.invoice', record['id'], 'invoice_open', cr)
         return {}
 
 account_invoice_confirm()
@@ -61,7 +61,7 @@ class account_invoice_cancel(osv.osv_memory):
         wf_service = netsvc.LocalService('workflow')
         pool_obj = pooler.get_pool(cr.dbname)
         data_inv = pool_obj.get('account.invoice').read(cr, uid, context['active_ids'], ['state'], context=context)
-        
+
         for record in data_inv:
             if record['state'] in ('cancel','paid'):
                 raise osv.except_osv(_('Warning'), _("Selected Invoice(s) cannot be cancelled as they are already in 'Cancelled' or 'Done' state!"))

addons/account/wizard/account_invoice_state_view.xml

@@ -1,22 +1,22 @@
 <openerp>
     <data>
 
-		<record id="account_invoice_confirm_view" model="ir.ui.view">
+        <record id="account_invoice_confirm_view" model="ir.ui.view">
             <field name="name">account.invoice.confirm.form</field>
             <field name="model">account.invoice.confirm</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Confirm Draft Invoices">
-			    <separator string="Confirm Draft Invoices" colspan="4"/>
+            <form string="Confirm Draft Invoices">
+                <separator string="Confirm Draft Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
-                    	<button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button icon="gtk-execute" string="Confirm Invoices" name="invoice_confirm" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
-		<record id="action_account_invoice_confirm" model="ir.actions.act_window">
+        <record id="action_account_invoice_confirm" model="ir.actions.act_window">
             <field name="name">Confirm Draft Invoices</field>
             <field name="res_model">account.invoice.confirm</field>
             <field name="view_type">form</field>
@@ -25,7 +25,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="action_account_invoice_confirm_values">
+        <record model="ir.values" id="action_account_invoice_confirm_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
             <field name="name">Confirm Draft Invoices</field>
@@ -33,24 +33,24 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_confirm'))" />
             <field name="key">action</field>
             <field name="model">account.invoice</field>
-		</record>
+        </record>
 
-		<record id="account_invoice_cancel_view" model="ir.ui.view">
+        <record id="account_invoice_cancel_view" model="ir.ui.view">
             <field name="name">account.invoice.cancel.form</field>
             <field name="model">account.invoice.cancel</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-			<form string="Cancel Selected Invoices">
-			    <separator string="Cancel Selected Invoices" colspan="4"/>
+            <form string="Cancel Selected Invoices">
+                <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Close"/>
-                    	<button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" special="cancel" string="Close"/>
+                        <button icon="gtk-execute" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
-    	</record>
+        </record>
 
-		<record id="action_account_invoice_cancel" model="ir.actions.act_window">
+        <record id="action_account_invoice_cancel" model="ir.actions.act_window">
             <field name="name">Cancel Selected Invoices</field>
             <field name="res_model">account.invoice.cancel</field>
             <field name="view_type">form</field>
@@ -59,7 +59,7 @@
            <field name="target">new</field>
         </record>
 
-		<record model="ir.values" id="action_account_invoice_cancel_values">
+        <record model="ir.values" id="action_account_invoice_cancel_values">
             <field name="model_id" ref="account.model_account_invoice" />
             <field name="object" eval="1" />
             <field name="name">Cancel Selected Invoices</field>
@@ -67,7 +67,7 @@
             <field name="value" eval="'ir.actions.act_window,' +str(ref('action_account_invoice_cancel'))" />
             <field name="key">action</field>
             <field name="model">account.invoice</field>
-		</record>
+        </record>
 
-	</data>
-</openerp>
+    </data>
+</openerp>

addons/account/wizard/account_journal_select_view.xml

@@ -8,11 +8,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Journal Select">
-                		<label string="Are you sure you want to open Journal Entries!" colspan="4"/>
-                       	<separator string="" colspan="4" />
+                        <label string="Are you sure you want to open Journal Entries!" colspan="4"/>
+                           <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+                        <button icon="gtk-open" string="Open Entries" name="action_open_window" type="object"/>
                    </group>
                </form>
             </field>

addons/account/wizard/account_move_line_select.py

@@ -43,7 +43,7 @@ class account_move_line_select(osv.osv_memory):
         else:
             fiscalyear_ids = [context['fiscalyear']]
 
-        fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
+#        fiscalyear_ids = fiscalyear_obj.search(cr, uid, [('state', '=', 'draft')])
         fiscalyears = fiscalyear_obj.browse(cr, uid, fiscalyear_ids)
 
         period_ids = []

addons/account/wizard/account_reconcile.py

@@ -56,11 +56,11 @@ class account_move_line_reconcile(osv.osv_memory):
         if 'trans_nbr' in fields:
             res.update({'trans_nbr':data['trans_nbr']})
         if 'credit' in fields:
-            res.update({'trans_nbr':data['credit']})
+            res.update({'credit':data['credit']})
         if 'debit' in fields:
-            res.update({'trans_nbr':data['debit']})
+            res.update({'debit':data['debit']})
         if 'writeoff' in fields:
-            res.update({'trans_nbr':data['writeoff']})
+            res.update({'writeoff':data['writeoff']})
         return res
 
     def partial_check(self, cr, uid, ids, context=None):

addons/account/wizard/account_use_model_view.xml

@@ -7,15 +7,17 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Create Entries From Models">
-                	<group colspan="4" >
-	                	<field name="model"/>
-                	</group>
-                    <group colspan="4" col="6">
-                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
-                   </group>
-               </form>
+			<form string="Create Entries From Models">
+				<group height="240" width="510">
+					<separator string="This wizard will create entries from Models" colspan="4"/>
+					<field name="model"/>
+					<separator colspan="4"/>
+					<group colspan="4" col="2">
+						<button icon="gtk-cancel" special="cancel" string="Cancel"/>
+						<button icon="gtk-execute" string="Create Entries" name="create_entries" type="object"/>
+					</group>
+				</group>
+			</form>
             </field>
         </record>
 
@@ -47,14 +49,13 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<label string = "Entry Lines Created." colspan="2"/>
-                       	<newline/>
-                    	<button icon="gtk-ok" special="cancel" string="Ok"/>
-                    	<button icon="gtk-execute" string="Open" name="open_moves" type="object" default_focus='1'/>
-                   </group>
-               </form>
+            <form string="Use Model">
+            	<group height="80" width="260">
+                   	<separator string = "Entry Lines Created." colspan="4"/>
+                	<button icon="gtk-ok" special="cancel" string="Ok"/>
+                	<button icon="gtk-execute" string="Open" name="open_moves" type="object" default_focus='1'/>
+               </group>
+			</form>
             </field>
         </record>
 
@@ -63,14 +64,13 @@
             <field name="model">account.use.model</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Use Model">
-                	<group colspan="4" col="6">
-                       	<label string = "Are you sure you want to create entries?" colspan="2"/>
-                       	<newline/>
-                    	<button icon="gtk-ok" special="cancel" string="Cancel"/>
-                    	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
-                   </group>
-               </form>
+		    <form string="Use Model">
+				<group height="90" width="310">
+		               	<separator string = "Are you sure you want to create entries?" colspan="4"/>
+		            	<button icon="gtk-ok" special="cancel" string="Cancel"/>
+		            	<button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
+		       </group>
+		    </form>
             </field>
         </record>
 

addons/account_analytic_analysis/i18n/el.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: 2009-09-08 15:31+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-06-09 03:00+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
@@ -80,7 +80,7 @@ msgstr "Θεωρητικά Έσοδα"
 #. module: account_analytic_analysis
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στην δήλωση ενέργειας"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
@@ -230,7 +230,7 @@ msgstr "Αναλυτικοί Λογαριασμοί"
 #. module: account_analytic_analysis
 #: model:ir.module.module,shortdesc:account_analytic_analysis.module_meta_information
 msgid "report_account_analytic"
-msgstr ""
+msgstr "report_account_analytic"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0

addons/account_analytic_plans/account_analytic_plans.py

@@ -97,6 +97,8 @@ class account_analytic_plan_instance(osv.osv):
     }
 
     def search(self, cr, user, args, offset=0, limit=None, order=None, context=None, count=False):
+        if context is None:
+            context = {}
         if context.get('journal_id', False):
             journal = self.pool.get('account.journal').browse(cr, user, [context['journal_id']], context=context)[0]
             analytic_journal = journal.analytic_journal_id and journal.analytic_journal_id.id or False

addons/account_anglo_saxon/__openerp__.py

@@ -1,5 +1,5 @@
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -14,7 +14,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
@@ -22,11 +22,11 @@
     "version" : "1.2",
     "author" : "Tiny, Veritos",
     "website" : "http://tinyerp.com - http://veritos.nl",
-    "description" : """This module will support the Anglo-Saxons accounting methodology by 
-    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries 
-    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales. 
-    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.
-    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 
+    "description" : """This module will support the Anglo-Saxons accounting methodology by
+    changing the accounting logic with stock transactions. The difference between the Anglo-Saxon accounting countries
+    and the Rhine or also called Continental accounting countries is the moment of taking the Cost of Goods Sold versus Cost of Sales.
+    Anglo-Saxons accounting does take the cost when sales invoice is created, Continental accounting will take the cost at the moment the goods are shipped.
+    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
     when the invoice is created to transfer this amount to the debtor or creditor account.
     Secondly, price differences between actual purchase price and fixed product standard price are booked on a seperate account""",
     "depends" : ["product", "account", "sale", "purchase", "stock"],

addons/account_anglo_saxon/i18n/el.po

@@ -0,0 +1,66 @@
+# Greek 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-06-09 03:12+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+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 ""
+
+#. 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_balance/i18n/el.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: 2009-09-08 14:38+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-06-09 03:36+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_balance
@@ -59,7 +59,7 @@ msgstr "Όνομα Λογαριασμού"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Debit"
-msgstr ""
+msgstr "Χρέωση"
 
 #. module: account_balance
 #: wizard_button:account.balance.account.balance.report,init,checkyear:0
@@ -117,6 +117,25 @@ msgid ""
 "    5. You have an option to print the desired report in Landscape format.\n"
 "    "
 msgstr ""
+"Το κομμάτι Ισολογισμών είναι ένα επιπρόσθετο λειτουργικό κομμάτι στο κομμάτι "
+"της Οικονομικής Διαχείρισης\n"
+"\n"
+"    Αυτό το κομμάτι σου δίνει διάφορες επιλογές για εκτύπωση ισολογισμών.\n"
+"\n"
+"    1. Μπορείς να συγκρίνεις τους ισολογισμούς διαφόρων ετών.\n"
+"\n"
+"    2. Μπορείς να ορίσεις την απόλυτη ή επί τοις εκατό σύγκριση μεταξύ δύο "
+"ετών.\n"
+"\n"
+"    3. Μπορείς να ορίσεις το ισολογισμό αναφοράς για την επί τοις εκατό "
+"σύγκριση συγκεκριμένων ετών.\n"
+"\n"
+"    4. Μπορείς να επιλέξεις περιόδους ως πραγματική ημερομηνία ή περιόδους "
+"ως ημέρα δημιουργίας.\n"
+"\n"
+"    5. Έχεις δυνατότητα να εκτυπώσεις την επιθυμητή αναφορά σε μορφή "
+"Landscape.\n"
+"    "
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -143,13 +162,13 @@ msgstr "Με ισοζύγιο που δεν είναι ίσο με 0"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Total :"
-msgstr ""
+msgstr "Σύνολο:"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Account Balance -"
-msgstr ""
+msgstr "Ισολογισμός"
 
 #. module: account_balance
 #: wizard_field:account.balance.account.balance.report,init,format_perc:0
@@ -196,7 +215,7 @@ msgstr "Εμφάνιση Λογαριασμών"
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Credit"
-msgstr ""
+msgstr "Πίστωση"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -206,13 +225,13 @@ msgstr "1. Έχετε επιλέξτε περισσότερα απο 3 έτη σ
 #. module: account_balance
 #: model:ir.module.module,shortdesc:account_balance.module_meta_information
 msgid "Accounting and financial management-Compare Accounts"
-msgstr ""
+msgstr "Λογιστική και οικονομική διαχείριση - Σύγκριση λογαριασμών"
 
 #. module: account_balance
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Year :"
-msgstr ""
+msgstr "Έτος :"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0
@@ -223,7 +242,7 @@ msgstr "Μπορείτε να επιλέξετε το πολύ 3 έτη. Παρ
 #: rml:account.account.balance.landscape:0
 #: rml:account.balance.account.balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Υπόλοιπο"
 
 #. module: account_balance
 #: wizard_view:account.balance.account.balance.report,backtoinit:0

addons/account_budget/__openerp__.py

@@ -62,6 +62,10 @@ Three reports are available:
         'wizard/account_budget_crossovered_report_view.xml',
     ],
     'demo_xml': ['crossovered_budget_demo.xml'],
+    'test':[
+#            'test/account_budget_spread.yml',
+            'test/account_budget.yml',
+            ],
     'installable': True,
     'active': False,
     'certificate': '0043819694157',

addons/account_budget/test/account_budget.yml

@@ -0,0 +1,71 @@
+-
+  In order to check account budget module in OpenERP I created a budget with few budget position
+-
+  Creating a crossovered.budget record
+-
+  !record {model: crossovered.budget, id: crossovered_budget_budget0}:
+    code: B2011
+    date_from: '2011-01-01'
+    date_to: '2011-12-31'
+    name: Budget 2011
+    state: draft
+-
+  I created two different budget lines
+-
+  Modifying a crossovered.budget record
+-
+  !record {model: crossovered.budget, id: crossovered_budget_budget0}:
+    crossovered_budget_line:
+      - analytic_account_id: account.analytic_consultancy
+        date_from: '2011-01-01'
+        date_to: '2011-12-31'
+        general_budget_id: account_budget.account_budget_post_purchase0
+        planned_amount: 10000.0
+      - analytic_account_id: account.analytic_super_product_trainings
+        date_from: '2011-09-01'
+        date_to: '2011-09-30'
+        general_budget_id: account_budget.account_budget_post_sales0
+        planned_amount: 400000.0
+
+-
+  I check that Initially Budget is in "draft" state
+-
+  !assert {model: crossovered.budget, id: crossovered_budget_budget0}:
+    - state == 'draft'
+
+-
+  I pressed the confirm button to confirm the Budget
+-
+  Performing a workflow action confirm on module crossovered.budget
+-
+  !workflow {model: crossovered.budget, action: confirm, ref: crossovered_budget_budget0}
+-
+  I check that budget is in "Confirmed" state
+-
+  !assert {model: crossovered.budget, id: crossovered_budget_budget0}:
+    - state == 'confirm'
+
+-
+  I pressed the validate button to validate the Budget
+-
+  Performing a workflow action validate on module crossovered.budget
+-
+  !workflow {model: crossovered.budget, action: validate, ref: crossovered_budget_budget0}
+-
+  I check that budget is in "Validated" state
+-
+  !assert {model: crossovered.budget, id: crossovered_budget_budget0}:
+    - state == 'validate'
+
+-
+  I pressed the done button to done the Budget
+-
+  Performing a workflow action done on module crossovered.budget
+-
+  !workflow {model: crossovered.budget, action: done, ref: crossovered_budget_budget0}
+-
+  I check that budget is in "done" state
+-
+  !assert {model: crossovered.budget, id: crossovered_budget_budget0}:
+    - state == 'done'
+

addons/account_budget/test/account_budget_spread.yml

@@ -0,0 +1,19 @@
+-
+ In order to test Spread Wizard of account module I spread record with amount=1000
+- 
+  Creating a account.budget.spread record
+- 
+  !record {model: account.budget.spread, id: account_budget_spread_0}:
+    amount: 1000.0
+    fiscalyear: account.data_fiscalyear
+    
+    
+- 
+  Performing an osv_memory action check_spread on module account.budget.spread
+- 
+  !python {model: account.budget.spread}: |
+    self.check_spread(cr, uid, [ref("account_budget_spread_0")], {"lang": 'en_US',
+      "active_model": "account.budget.post", "active_ids": [ref("account_budget.account_budget_post_sales0")],
+      "tz": False, "active_id": ref("account_budget.account_budget_post_sales0"),
+      })
+

addons/account_budget/wizard/account_budget_spread.py

@@ -32,13 +32,12 @@ class account_budget_spread(osv.osv_memory):
         }
 
     def check_spread(self, cr, uid, ids, context=None):
-        service = netsvc.LocalService("object_proxy")
         if context is None:
             context = {}
-        data = self.read(cr, uid, ids, [])[0]
-        res = service.execute(cr.dbname, uid, 'account.budget.post', 'spread', context['active_ids'], data['fiscalyear'], data['amount'])
+        data = self.browse(cr, uid, ids, context=context)[0]
+        res = self.pool.get('account.budget.post').spread(cr, uid, context['active_ids'], data.fiscalyear.id, data.amount)
         return {}
 
 account_budget_spread()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_budget/wizard/account_budget_spread_view.xml

@@ -10,6 +10,7 @@
 	             <form string="Select Dates Period">
 				    <field name="fiscalyear"/>
 				    <field name="amount"/>
+				    <separator colspan="4"/>
 				    <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
      					<button special="cancel" string="Cancel" icon="gtk-cancel"/>

addons/account_cancel/__init__.py

@@ -19,6 +19,5 @@
 #
 ##############################################################################
 
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

addons/account_cancel/__openerp__.py

@@ -21,21 +21,20 @@
 
 
 {
-    'name': 'Board for Human Reasources Management',
-    'version': '1.0',
-    'category': 'Board/Human Resources',
-    'description': """
-This module implements a dashboard for human resource management that includes:
-    * My Current Timesheet
-    * My Leaves
-    * My Expenses
+    "name" : "Account Cancel",
+    "version" : "1.1",
+    "depends" : ["account"],
+    "author" : "Tiny",
+    "category": 'Generic Modules/Accounting',
+    "description": """
+    Module Add Allow cancelling entries field on form view of account journal if it set to true it allows user to cancel entries & invoices.
     """,
-    'author': 'Tiny',
-    'depends': [ 'project_issue','board','hr_expense','hr_timesheet_sheet','hr_holidays'
-   , 'hr_evaluation'],
-    'update_xml': ['board_hr_view.xml'],
+    'website': 'http://www.openerp.com',
+    'init_xml': [],
+    'update_xml': ['account_cancel_view.xml' ],
     'demo_xml': [],
     'installable': True,
     'active': False,
+
 }
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_cancel/account_cancel_view.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+		<record id="view_account_journal_form_inherit" model="ir.ui.view">
+            <field name="name">account.journal.form</field>
+            <field name="model">account.journal</field>
+            <field name="type">form</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                 <xpath expr="/form/notebook/page[@string='General Information']/group/field[@name='centralisation']" position="after">
+                    <field name="update_posted"/>
+                </xpath>
+            </field>
+       	</record>
+	</data>
+</openerp>

addons/account_coda/i18n/el.po

@@ -0,0 +1,168 @@
+# Greek 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 13:11+0000\n"
+"PO-Revision-Date: 2010-06-09 02:57+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Το όνομα του Αντικειμένου πρέπει να ξεκινά με x_ και δεν πρέπει να περιέχει "
+"ειδικούς χαρακτήρες!"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "Καταγραφή"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr "Πατήστε \"Νέο\" για να επιλέξετε το αρχείο σας"
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Εισαγωγή ιστορικού καταγραφής"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr "Προεπιλεγμένος λογαριασμός είσπραξης"
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr "Δημιουργημένος τραπεζικός λογαριασμός"
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Χρήστης"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "Προεπιλεγμένος λογαριασμός πληρωμής"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_Εντάξει"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "Αποτελέσματα :"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "Εισαγωγή ημερομηνίας"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""

addons/account_coda/i18n/et.po

@@ -0,0 +1,167 @@
+# Estonian 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 13:11+0000\n"
+"PO-Revision-Date: 2010-06-08 17:34+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"Language-Team: Estonian <et@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-06-11 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr "Logi"
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Vigane mudeli nimi toimingu definitsioonis."
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr "Impordi logi"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+"    bank statements from .csv file.\n"
+"    Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr "_Sulge"
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr "Kasutaja"
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr "Vaikimisi on tasulised konto"
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr "_Ok"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr "Tulemused :"
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr "Importimise aeg"
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""

addons/account_coda/wizard/coda_import.py

@@ -33,10 +33,12 @@ codawiz_form = """<?xml version="1.0"?>
 <separator colspan="4" string="Select your bank journal :" />
     <field name="journal_id" colspan="1" domain="[('type','=','cash')]" />
     <newline />
-    <field name="def_payable" />    <field name="def_receivable" />
+    <field name="def_payable" />
+    <newline />
+    <field name="def_receivable" />
     <newline />
     <field name="awaiting_account" />
-    <separator string="Clic on 'New' to select your file :" colspan="4"/>
+    <separator string="Click on 'New' to select your file :" colspan="4"/>
     <field name="coda"/>
 </form>
 """
@@ -122,7 +124,7 @@ def _coda_parsing(self, cr, uid, data, context):
             bank_statement['date'] = str2date(line[5:11])
             bank_statement['journal_id']=data['form']['journal_id']
             period_id = pool.get('account.period').search(cr,uid,[('date_start','<=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d"))),('date_stop','>=',time.strftime('%Y-%m-%d',time.strptime(bank_statement['date'],"%y/%m/%d")))])
-            bank_statement['period_id'] = period_id[0]
+#            bank_statement['period_id'] = period_id and period_id[0] or False
             bank_statement['state']='draft'
         elif line[0] == '1':
             # old balance data
@@ -219,7 +221,7 @@ def _coda_parsing(self, cr, uid, data, context):
             bk_st_id = pool.get('account.bank.statement').create(cr,uid,{
                 'journal_id': statement['journal_id'],
                 'date':time.strftime('%Y-%m-%d',time.strptime(statement['date'],"%y/%m/%d")),
-                'period_id':statement['period_id'],
+#                'period_id':statement['period_id'],
                 'balance_start': statement["balance_start"],
                 'balance_end_real': statement["balance_end_real"],
                 'state': 'draft',
@@ -254,7 +256,7 @@ def _coda_parsing(self, cr, uid, data, context):
             std_log += "\nStatement : %s , Date  : %s, Starting Balance :  %.2f , Ending Balance : %.2f \n"\
                       %(statement['name'], statement['date'], float(statement["balance_start"]), float(statement["balance_end_real"]))
             bkst_list.append(bk_st_id)
-        
+
         except osv.except_osv, e:
             cr.rollback()
             nb_err+=1

addons/account_followup/i18n/hr.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup

addons/account_followup/test/account_followup.yml

@@ -0,0 +1,111 @@
+-
+  In order to test account followup module in OpenERP I create a FollowUp structure
+-
+  !record {model: account_followup.followup, id: account_followup_followup_testfollowups0}:
+    description: First letter after 15 net days, 30 net days and 45 days end of month levels.
+    followup_line:
+      - delay: 15
+        name: 'level 0: 15 days'
+        sequence: 0
+        start: days
+        description: Dear %(partner_name)s,\n\nException made if there was a mistake
+          of ours, it seems that the following amount staid unpaid. Please, take appropriate
+          measures in order to carry out this payment in the next 1 days.\n\nWould your
+          payment have been carried out after this mail was sent, please consider the
+          present one as void. Do not hesitate to contact our accounting department at
+          (+32).10.68.94.39.\n\nBest Regards,\n
+      - delay: 30
+        name: 'level1: 30 days'
+        sequence: 1
+        start: days
+        description: Dear %(partner_name)s,\n\nException made if there was a mistake
+          of ours, it seems that the following amount staid unpaid. Please, take appropriate
+          measures in order to carry out this payment in the next 2 days.\n\nWould your
+          payment have been carried out after this mail was sent, please consider the
+          present one as void. Do not hesitate to contact our accounting department at
+          (+32).10.68.94.39.\n\nBest Regards,\n
+      - delay: 45
+        name: 'level 2: 45 days'
+        sequence: 2
+        start: days
+        description: Dear %(partner_name)s,\n\nException made if there was a mistake
+          of ours, it seems that the following amount staid unpaid. Please, take appropriate
+          measures in order to carry out this payment in the next 3 days.\n\nWould your
+          payment have been carried out after this mail was sent, please consider the
+          present one as void. Do not hesitate to contact our accounting department at
+          (+32).10.68.94.39.\n\nBest Regards,
+    name: My followups
+
+-
+  I create an invoice
+-
+  !record {model: account.invoice, id: account_invoice_followup}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    reference_type: none
+
+
+-
+  I change the state of the invoice using create button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_followup}
+
+-
+  I create a send followup record
+-
+  !record {model: account.followup.print, id: account_followup_print_0}:
+    date: '2010-06-08'
+    followup_id: account_followup_followup_testfollowups0
+
+
+-
+  I Select Followup and clicked on Continue Button
+-
+  !python {model: account.followup.print}: |
+    self.do_continue(cr, uid, [ref("account_followup_print_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
+      "tz": False, "active_id": ref("account_followup.account_followup_print_menu"),
+      })
+
+
+-
+  I select partners whom I want to send followups
+-
+  !record {model: account.followup.print.all, id: account_followup_print_all_0}:
+    email_body: 'Date : %(date)s\n\nDear %(partner_name)s,\n\nPlease find in attachment
+      a reminder of all your unpaid invoices, for a total amount due of:\n\n%(followup_amount).2f
+      %(company_currency)s\n\nThanks,\n--\n%(user_signature)s\n%(company_name)s'
+    email_subject: Invoices Reminder
+    partner_ids:
+      - base.res_partner_desertic_hispafuentes
+    partner_lang: 1
+
+
+-
+  I clicked on Print Follow Ups to print Followups reports
+-
+  !python {model: account.followup.print.all}: |
+    self.do_print(cr, uid, [ref("account_followup_print_all_0")], {"lang": 'en_US',
+      "active_model": "ir.ui.menu", "active_ids": [ref("account_followup.account_followup_print_menu")],
+      "tz": False, "date": "2010-06-08", "followup_id": ref("account_followup_followup_testfollowups0"), "active_id": ref("account_followup.account_followup_print_menu"),
+      })
+
+
+
+
+
+
+
+

addons/account_invoice_layout/i18n/el.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: 2009-09-08 13:37+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-06-09 03:16+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:12+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -38,7 +38,7 @@ msgstr ""
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Ακυρωμένο τιμολόγιο"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -59,7 +59,7 @@ msgstr "Εκπτ. (%)"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "(Incl. taxes):"
-msgstr ""
+msgstr "(με φόρους)"
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0
@@ -87,7 +87,7 @@ msgstr "Τιμή Μονάδας"
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_notify_message
@@ -122,7 +122,7 @@ msgstr "Σχετ. Πελάτης:"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid ")"
-msgstr ""
+msgstr ")"
 
 #. module: account_invoice_layout
 #: field:account.invoice.line,state:0
@@ -137,7 +137,7 @@ msgstr "Τιμή"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "/ ("
-msgstr ""
+msgstr "/ ("
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -192,7 +192,7 @@ msgstr "Page Break"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Document:"
-msgstr ""
+msgstr "Έγγραφο:"
 
 #. module: account_invoice_layout
 #: wizard_view:wizard.notify_message,init:0
@@ -217,7 +217,7 @@ msgstr "Τιμολόγια με Διάταξη"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description / Taxes"
-msgstr ""
+msgstr "Περιγραφή / Φόροι"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -227,7 +227,7 @@ msgstr "Ποσό"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Description/Taxes"
-msgstr ""
+msgstr "Περιγραφή/Φόροι"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -267,7 +267,7 @@ msgstr "Τιμολόγιο Προμηθευτή"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Note :"
-msgstr ""
+msgstr "Σημείωση :"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
@@ -282,7 +282,7 @@ msgstr "account_invoice_layout"
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0
 msgid "Total (Excl. taxes):"
-msgstr ""
+msgstr "Σύνολο (Χωρίς φόρους)"
 
 #. module: account_invoice_layout
 #: rml:account.invoice.layout:0

addons/account_payment/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -23,11 +23,10 @@
 # Init Sales
 #----------------------------------------------------------
 
-import payment
+import account_payment
 import wizard
 import account_move_line
 import account_invoice
 import report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-

addons/account_payment/__openerp__.py

@@ -41,14 +41,14 @@
         'wizard/account_payment_pay_view.xml',
         'wizard/account_payment_populate_statement_view.xml',
         'wizard/account_payment_create_order_view.xml',
-        'payment_view.xml',
-        'payment_workflow.xml',
-        'payment_sequence.xml',
+        'account_payment_view.xml',
+        'account_payment_workflow.xml',
+        'account_payment_sequence.xml',
         'account_invoice_view.xml',
-        'payment_report.xml',
-
+        'account_payment_report.xml',
     ],
     'demo_xml': [],
+    'test': ['test/account_payment.yml'],
     'installable': True,
     'active': False,
     'certificate': '0061703998541',

addons/account_payment/account_payment.py

@@ -18,29 +18,25 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-from osv import fields
-from osv import osv
 import time
-import netsvc
-import pooler
 
+from osv import osv, fields
+import netsvc
 
 class payment_type(osv.osv):
     _name= 'payment.type'
     _description= 'Payment Type'
     _columns= {
-        'name': fields.char('Name', size=64, required=True,help='Payment Type'),
-        'code': fields.char('Code', size=64, required=True,help='Specifies the Code for Payment Type'),
+        'name': fields.char('Name', size=64, required=True, help='Payment Type'),
+        'code': fields.char('Code', size=64, required=True, help='Specifies the Code for Payment Type'),
         'suitable_bank_types': fields.many2many('res.partner.bank.type',
             'bank_type_payment_type_rel',
             'pay_type_id','bank_type_id',
             'Suitable bank types')
-    }
+            }
 
 payment_type()
 
-
 class payment_mode(osv.osv):
     _name= 'payment.mode'
     _description= 'Payment Mode'
@@ -66,16 +62,14 @@ class payment_mode(osv.osv):
             where pm.id = %s """, [payment_code])
         return [x[0] for x in cr.fetchall()]
 
-
 payment_mode()
 
-
 class payment_order(osv.osv):
     _name = 'payment.order'
     _description = 'Payment Order'
     _rec_name = 'reference'
 
-    def get_wizard(self,type):
+    def get_wizard(self, type):
         logger = netsvc.Logger()
         logger.notifyChannel("warning", netsvc.LOG_WARNING,
                 "No wizard found for the payment type '%s'." % type)
@@ -146,7 +140,6 @@ class payment_order(osv.osv):
 
 payment_order()
 
-
 class payment_line(osv.osv):
     _name = 'payment.line'
     _description = 'Payment Line'

addons/account_payment/i18n/el.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: 2009-09-08 15:11+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
+"PO-Revision-Date: 2010-06-09 06:03+0000\n"
+"Last-Translator: Panayiotis Konstantinidis <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:11+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -40,7 +40,7 @@ msgstr "Επιλέξτε την Κατάσταση Πληρωμής που θα
 #. module: account_payment
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Λανθασμένο όνομα μοντέλου στον ορισμό ενέργειας"
 
 #. module: account_payment
 #: view:payment.line:0

addons/account_payment/i18n/zh_CN.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment

addons/account_payment/test/account_payment.yml

@@ -0,0 +1,145 @@
+-
+  In order to test account_payment in OpenERP I create a new record Type
+-
+-
+  Creating a payment.type record
+-
+  !record {model: payment.type, id: payment_type_t0}:
+    code: T0
+    name: TestType
+
+-
+  I created a new Bank Record
+-
+  Creating a res.partner.bank record
+-
+  !record {model: res.partner.bank, id: res_partner_bank_0}:
+    acc_number: '0001'
+    partner_id: base.res_partner_9
+    sequence: 0.0
+    state: bank
+
+-
+  I created a new Payment Mode
+-
+  Creating a payment.mode record
+-
+  !record {model: payment.mode, id: payment_mode_m0}:
+    bank_id: res_partner_bank_0
+    journal: account.bank_journal
+    name: TestMode
+    type: payment_type_t0
+
+-
+  I created a Supplier Invoice
+-
+  Creating a account.invoice record
+-
+  !record {model: account.invoice, id: account_invoice_payment}:
+    account_id: account.a_pay
+    address_contact_id: base.res_partner_address_tang
+    address_invoice_id: base.res_partner_address_tang
+    check_total: 300.0
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_expense
+        name: '[PC1] Basic PC'
+        price_unit: 300.0
+        product_id: product.product_product_pc1
+        quantity: 1.0
+        uos_id: product.product_uom_unit
+    journal_id: account.expenses_journal
+    partner_id: base.res_partner_asus
+    reference_type: none
+    type: in_invoice
+
+-
+  I make the supplier invoice in Open state
+-
+  Performing a workflow action invoice_open on module account.invoice
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_payment}
+
+-
+  I create a new payment order
+-
+  Creating a payment.order record
+-
+  !record {model: payment.order, id: payment_order_0}:
+    date_prefered: due
+    mode: payment_mode_m0
+    reference: 2010/006
+    user_id: base.user_root
+
+
+-
+  Creating a payment.order.create record
+-
+  !record {model: payment.order.create, id: payment_order_create_0}:
+    duedate: '2010-06-04'
+
+-
+  I searched the entries using "Payment Create Order" wizard
+-
+  Performing an osv_memory action search_entries on module payment.order.create
+-
+  !python {model: payment.order.create}: |
+    self.search_entries(cr, uid, [ref("payment_order_create_0")], {"lang": "en_US",
+      "active_model": "payment.order", "active_ids": [ref("payment_order_0")],
+      "tz": False, "active_id": ref("payment_order_0"), })
+-
+  I check that Initially Payment order is in "draft" state
+-
+  !assert {model: payment.order, id: payment_order_0}:
+    - state == 'draft'
+-
+  I pressed the confirm payment button to confirm the payment
+-
+  Performing a workflow action open on module payment.order
+-
+  !workflow {model: payment.order, action: open, ref: payment_order_0}
+-
+  I check that Payment order is in "Confirmed" state
+-
+  !assert {model: payment.order, id: payment_order_0}:
+    - state == 'open'
+-
+  I paid the payment using "Make Payments" Button
+-
+  Creating a account.payment.make.payment record
+-
+  !record {model: account.payment.make.payment, id: account_payment_make_payment_0}:
+    {}
+
+-
+  Performing an osv_memory action launch_wizard on module account.payment.make.payment
+-
+  !python {model: account.payment.make.payment}: |
+    self.launch_wizard(cr, uid, [ref("account_payment_make_payment_0")], {"lang":
+      "en_US", "active_model": "payment.order", "active_ids": [ref("payment_order_0")], "tz":
+      False, "active_id": ref("payment_order_0"), })
+
+-
+  I check that Payment order is in "Done" state
+-
+  !assert {model: payment.order, id: payment_order_0}:
+    - state == 'done'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

addons/account_payment/wizard/account_payment_order.py

@@ -110,8 +110,7 @@ class payment_order_create(osv.osv_memory):
         context.update({'line_ids': line_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_create_payment_order_lines')], context=context)
         resource_id = mod_obj.read(cr, uid, model_data_ids, fields=['res_id'], context=context)[0]['res_id']
-        return {
-                'name': ('Entrie Lines'),
+        return {'name': ('Entrie Lines'),
                 'context': context,
                 'view_type': 'form',
                 'view_mode': 'form',

addons/account_payment/wizard/account_payment_pay.py

@@ -18,16 +18,13 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import time
 from osv import fields, osv
 
 class account_payment_make_payment(osv.osv_memory):
     _name = 'account.payment.make.payment'
     _description = 'Account make payment'
-    _columns = {
-            }
 
-    def launch_wizard(self, cr, uid, ids, context):
+    def launch_wizard(self, cr, uid, ids, context=None):
         """
         Search for a wizard to launch according to the type.
         If type is manual. just confirm the order.
@@ -35,8 +32,8 @@ class account_payment_make_payment(osv.osv_memory):
         obj_payment_order = self.pool.get('payment.order')
         obj_model = self.pool.get('ir.model.data')
         obj_act = self.pool.get('ir.actions.act_window')
-        order= obj_payment_order.browse(cr,uid,context['active_id'],context)
-        t= order.mode and order.mode.type.code or 'manual'
+        order= obj_payment_order.browse(cr, uid, context['active_id'], context)
+        t = order.mode and order.mode.type.code or 'manual'
         if t == 'manual' :
             obj_payment_order.set_done(cr,uid,context['active_id'],context)
             return {}
@@ -49,12 +46,10 @@ class account_payment_make_payment(osv.osv_memory):
         module, wizard= gw
         result = mod_obj._get_id(cr, uid, module, wizard)
         id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
-        result = act_obj.read(cr, uid, [id])[0]
+        return act_obj.read(cr, uid, [id])[0]
         #result['context'] = str({'fiscalyear': data['form']['fiscalyear']})
-        return result
 
 
 account_payment_make_payment()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_payment/wizard/account_payment_pay_view.xml

@@ -8,7 +8,7 @@
              <field name="type">form</field>
              <field name="arch" type="xml">
 				<form string="Make Payment">
-					<group height="80" width="320">
+					<group height="100" width="320">
 						<separator string="Are you sure you want to make payment?"/>
 						<newline/>
 						<group  colspan="2" col="4">

addons/account_report/__openerp__.py

@@ -27,6 +27,7 @@
     'description': """Financial and accounting reporting
     Fiscal statements
     Indicators
+    Add a dashboards for accountant that include  Indicators reporting.
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
@@ -39,6 +40,7 @@
         'account_wizard.xml',
         'wizard/account_report_print_indicators_view.xml',
         'wizard/account_report_print_indicators_with_pdf_view.xml',
+        'board_account_report_view.xml',
     ],
     'demo_xml': [],
     'installable': True,

addons/account_report/board_account_report_view.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+        <record id="board_account_report_form" model="ir.ui.view">
+            <field name="name">board.account.report.form</field>
+            <field name="model">board.board</field>
+			<field name="inherit_id" ref="account.board_account_form"/>              
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+      		<xpath expr="/form/hpaned/child2" position="inside"> 
+				<button colspan="4" icon="terp-purchase" name="%(account_report.action_account_report_tree_view_indicator)d" string="My indicators" type="action"/>
+			</xpath>
+            </field>
+        </record>
+    </data>
+</openerp>

addons/account_tax_include/__openerp__.py

@@ -35,6 +35,7 @@ This module implement the modification on the invoice form.
     'init_xml': [],
     'update_xml': ['account_tax_include_view.xml'],
     'demo_xml': [],
+    'test': ['test/account_tax_include.yml'],
     'installable': True,
     'active': False,
     'certificate': '0070514190381',

addons/account_tax_include/i18n/ru.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include

addons/account_tax_include/test/account_tax_include.yml

@@ -0,0 +1,93 @@
+
+-
+  Creating a tax record
+-
+  !record {model: account.tax, id: account_tax_a0}:
+    amount: 0.10000000000000001
+    applicable_type: 'true'
+    company_id: base.main_company
+    description: a
+    name: a
+    sequence: 1
+    type: percent
+    type_tax_use: all
+
+-
+  Creating a account invoice record with tax excluded
+-
+  !record {model: account.invoice, id: account_invoice_tax_exclude}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        invoice_line_tax_id:
+          - account_tax_a0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    price_type: tax_excluded
+    reference_type: none
+
+-
+  Performing an osv_memory action button_reset_taxes on module account.invoice
+-
+  !python {model: account.invoice}: |
+    self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False,
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
+      "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
+      })
+-
+  Check if tax is excluded in invoice
+-
+  !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}:
+       - state == "draft"
+       - amount_untaxed == 100.0
+       - amount_tax == 10.0
+       - amount_total == 110.0
+
+-
+  Creating a account invoice record with tax include
+-
+  !record {model: account.invoice, id: account_invoice_tax_include}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 100.0
+        quantity: 1.0
+        invoice_line_tax_id:
+          - account_tax_a0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    price_type: tax_included
+    reference_type: none
+
+-
+  Performing an osv_memory action button_reset_taxes on module account.invoice
+-
+  !python {model: account.invoice}: |
+    self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False,
+      "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
+      "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
+      })
+-
+  Check if tax is included in invoice
+-
+  !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}:
+       - state == "draft"
+       - amount_untaxed == 90.91
+       - amount_tax == 9.09
+       - amount_total == 100.00

addons/account_voucher/__openerp__.py

@@ -37,7 +37,7 @@
     "category" : "Generic Modules/Accounting",
     "website" : "http://tinyerp.com",
     "depends" : [
-        "base", 
+        "base",
         "account"
     ],
     "init_xml" : [
@@ -54,8 +54,12 @@
         "voucher_view.xml",
         "voucher_wizard.xml",
         "wizard/account_voucher_open_view.xml",
-        
+
     ],
+    "test" : [
+         "test/account_voucher.yml",
+    ],
+
     'certificate': '0037580727101',
     "active": False,
     "installable": True,

addons/account_voucher/test/account_voucher.yml

@@ -0,0 +1,116 @@
+
+-
+  In order to check account voucher module in OpenERP I create a customer voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher for Axelor
+    narration: Basic Pc
+    payment_ids:
+      - account_id: account.a_recv
+        amount: 1000.0
+        name: Voucher for Axelor
+        partner_id: base.res_partner_desertic_hispafuentes
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially customer voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'draft'
+-
+  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+-
+  !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I check that the voucher state is "Waiting for re-checking"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'recheck'
+-
+  I clicked on Validate Button
+-
+  !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor0}
+-
+  I check that the voucher state is "posted"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor0}:
+    - state == 'posted'
+
+-
+  I check that Moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor0"))
+    assert(acc_id.move_id)
+
+
+-
+  Now I create a Vendor Voucher
+-
+  !record {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher Axelor
+    narration: Basic PC
+    payment_ids:
+      - account_id: account.cash
+        amount: 1000.0
+        name: Voucher Axelor
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially vendor voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'draft'
+-
+  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+-
+  !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is "Waiting for re-checking"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'recheck'
+-
+  I clicked on Validate Button
+-
+  !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucheraxelor0}
+-
+  I check that the voucher state is "posted"
+-
+  !assert {model: account.voucher, id: account_voucher_voucheraxelor0}:
+    - state == 'posted'
+
+-
+  I check that moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucheraxelor0"))
+    assert(acc_id.move_id)

addons/account_voucher_payment/__openerp__.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 {
@@ -23,24 +23,29 @@
     "version" : "1.0",
     "author" : 'Tiny & Axelor',
     "description": """This module includes :
-    * It reconcile the invoice (supplier, customer) while paying through 
+    * It reconcile the invoice (supplier, customer) while paying through
     Accounting Vouchers
     """,
     "category" : "Generic Modules/Indian Accounting",
     "website" : "http://tinyerpindia.com",
     "depends" : [
-        "base", 
+        "base",
         "account",
         "account_voucher",
     ],
     "init_xml" : [
     ],
-    
+
     "demo_xml" : [],
     "update_xml" : [
         "account_voucher_payment_view.xml",
         "account_voucher_payment_wizard.xml"
     ],
+    "test" : [
+#        "test/account_voucher.yml",
+        "test/account_voucher_payment.yml",
+    ],
+
     "active": False,
     "installable": True,
 }

addons/account_voucher_payment/account_voucher_payment.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -35,9 +35,9 @@ class account_voucher(osv.osv):
     _columns = {
         'voucher_line_ids':fields.one2many('account.voucher.line','voucher_id','Voucher Lines', readonly=False, states={'proforma':[('readonly',True)]}),
     }
-        
+
     def action_move_line_create(self, cr, uid, ids, *args):
-        
+
         for inv in self.browse(cr, uid, ids):
             if inv.move_id:
                 continue
@@ -55,12 +55,12 @@ class account_voucher(osv.osv):
                 ref = inv.reference
             else:
                 ref = self._convert_ref(cr, uid, inv.number)
-                
+
             date = inv.date
             total_currency = 0
             for i in iml:
                 partner_id=i['partner_id']
-                acc_id = i['account_id']    
+                acc_id = i['account_id']
                 if inv.currency_id.id != company_currency:
                     i['currency_id'] = inv.currency_id.id
                     i['amount_currency'] = i['amount']
@@ -97,19 +97,19 @@ class account_voucher(osv.osv):
             line = map(lambda x:(0,0,self.line_get_convert(cr, uid, x,date, context={})) ,iml)
             an_journal_id=inv.journal_id.analytic_journal_id.id
             journal_id = inv.journal_id.id
-            
+
             journal = self.pool.get('account.journal').browse(cr, uid, journal_id)
             if journal.sequence_id:
                 name = self.pool.get('ir.sequence').get_id(cr, uid, journal.sequence_id.id)
 
             move = {
-                'name': name, 
-                'journal_id': journal_id, 
+                'name': name,
+                'journal_id': journal_id,
                 'voucher_type':inv.type,
                 'narration' : inv.narration,
                 'data':date
             }
-            
+
             if inv.period_id:
                 move['period_id'] = inv.period_id.id
                 for i in line:
@@ -128,7 +128,7 @@ class account_voucher(osv.osv):
                 'journal_id':journal_id ,
                 'period_id':inv.period_id.id,
                 'partner_id': False,
-                'ref': ref, 
+                'ref': ref,
                 'date': date
             }
             if inv.type in ('rec_voucher', 'bank_rec_voucher', 'journal_pur_voucher', 'journal_voucher'):
@@ -144,15 +144,15 @@ class account_voucher(osv.osv):
                     'voucher_invoice' : iml and iml[0]['invoice'] and iml[0]['invoice'].id or False,
                     'debit':False,
                     'credit':False,
-                    'move_id':move_id,                    
+                    'move_id':move_id,
                     'account_id':line.account_id.id or False,
                     'journal_id':journal_id ,
                     'period_id':inv.period_id.id,
                     'partner_id':line.partner_id.id or False,
-                    'ref':ref, 
+                    'ref':ref,
                     'date':date
                  }
-                
+
                 if line.type == 'dr':
                     move_line['debit'] = line.amount or False
                     amount=line.amount
@@ -161,7 +161,7 @@ class account_voucher(osv.osv):
                     amount=line.amount * (-1)
                 ml_id=self.pool.get('account.move.line').create(cr, uid, move_line)
                 id_mapping_dict[line.id] = ml_id
-                
+
                 total = 0.0
                 mline = self.pool.get('account.move.line')
                 if line.invoice_id.id:
@@ -180,7 +180,7 @@ class account_voucher(osv.osv):
                     line.name=inv.narration
                 else:
                     line.name=line.name
-                
+
                 if line.account_analytic_id:
                     an_line = {
                          'name':line.name,
@@ -197,22 +197,22 @@ class account_voucher(osv.osv):
                 self.pool.get('account.move.line').reconcile_partial(cr, uid, mline_ids, 'manual', context={})
             self.write(cr, uid, [inv.id], {'move_id': move_id})
             obj=self.pool.get('account.move').browse(cr, uid, move_id)
-            
+
             for line in obj.line_id :
                 cr.execute('insert into voucher_id (account_id,rel_account_move) values (%d, %d)',(int(ids[0]),int(line.id)))
-                
+
         return True
 
 account_voucher()
 
 class account_voucher_line(osv.osv):
     _inherit = 'account.voucher.line'
-    
+
     def default_get(self, cr, uid, fields, context={}):
         data = super(account_voucher_line, self).default_get(cr, uid, fields, context)
         self.voucher_context = context
         return data
-    
+
     _columns = {
         'invoice_id' : fields.many2one('account.invoice','Invoice'),
     }
@@ -220,8 +220,8 @@ class account_voucher_line(osv.osv):
     def move_line_get_item(self, cr, uid, line, context={}):
         res = super(account_voucher_line, self).move_line_get_item(cr, uid, line, context)
         res['invoice'] = line.invoice_id or False
-        return res 
-    
+        return res
+
     def onchange_invoice_id(self, cr, uid, ids, invoice_id, context={}):
         lines = []
         if 'lines' in self.voucher_context:
@@ -233,27 +233,27 @@ class account_voucher_line(osv.osv):
             residual = invoice_obj.residual
             same_invoice_amounts = [x['amount'] for x in lines if x['invoice_id']==invoice_id]
             residual -= sum(same_invoice_amounts)
-            return {'value' : {'amount':residual}}  
-    
+            return {'value' : {'amount':residual}}
+
     def onchange_line_account(self, cr, uid, ids, account_id, type, type1):
         if not account_id:
             return {'value' : {'account_id' : False, 'type' : False ,'amount':False}}
         obj = self.pool.get('account.account')
         acc_id = False
-        
+
         if type1 in ('rec_voucher','bank_rec_voucher', 'journal_voucher'):
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.credit
             type = 'cr'
-        elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') : 
+        elif type1 in ('pay_voucher','bank_pay_voucher','cont_voucher') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.debit
             type = 'dr'
-        elif type1 in ('journal_sale_vou') : 
+        elif type1 in ('journal_sale_vou') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.credit
             type = 'dr'
-        elif type1 in ('journal_pur_voucher') : 
+        elif type1 in ('journal_pur_voucher') :
             acc_id = obj.browse(cr, uid, account_id)
             balance = acc_id.debit
             type = 'cr'
@@ -265,7 +265,7 @@ account_voucher_line()
 
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
-    
+
     def action_cancel(self, cr, uid, ids, *args):
         res = super(account_invoice, self).action_cancel(cr, uid, ids, *args)
         invoices = self.read(cr, uid, ids, ['move_id'])
@@ -276,7 +276,7 @@ class account_invoice(osv.osv):
         move_ids = move_db.search(cr, uid, [])
         move_obj = move_db.browse(cr, uid, move_ids)
         return res
-    
+
 account_invoice()
 
 

addons/account_voucher_payment/account_voucher_unreconcile.py

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -32,11 +32,11 @@ _info_form = '''<?xml version="1.0"?>
 def _trans_unrec(self, cr, uid, data, context):
     pool = pooler.get_pool(cr.dbname)
     voucher = pool.get('account.voucher').browse(cr, uid, data.get('id'))
-    recs = None
+    recs = []
     for line in voucher.move_ids:
         if line.reconcile_id:
             recs = [line.reconcile_id.id]
-    
+
     for rec in recs:
         pool.get('account.move.reconcile').unlink(cr, uid, rec)
     return {}

addons/account_voucher_payment/i18n/ca.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment

addons/account_voucher_payment/i18n/es.po

@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher_payment

addons/account_voucher_payment/i18n/et.po

@@ -0,0 +1,86 @@
+# Estonian 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-05-13 20:11+0000\n"
+"PO-Revision-Date: 2010-06-08 17:42+0000\n"
+"Last-Translator: lyyser <logard.1961@gmail.com>\n"
+"Language-Team: Estonian <et@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-06-11 03:43+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_voucher_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation transactions"
+msgstr "Mittesobivad tehingud"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,description:account_voucher_payment.module_name_translation
+msgid ""
+"This module includes :\n"
+"    * It reconcile the invoice (supplier, customer) while paying through \n"
+"    Accounting Vouchers\n"
+"    "
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid ""
+"If you unreconciliate transactions, you must also verify all the actions "
+"that are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account_voucher_payment
+#: view:account.voucher:0
+#: field:account.voucher,voucher_line_ids:0
+msgid "Voucher Lines"
+msgstr "Tähiku read"
+
+#. module: account_voucher_payment
+#: model:ir.module.module,shortdesc:account_voucher_payment.module_name_translation
+msgid "Invoice Payment/Receipt by Vouchers."
+msgstr ""
+
+#. module: account_voucher_payment
+#: model:ir.actions.wizard,name:account_voucher_payment.wizard_unreconcile_voucher
+msgid "Unreconcile entries"
+msgstr "Kooskõlastamatta kirjed"
+
+#. module: account_voucher_payment
+#: field:account.move.line,voucher_invoice:0
+#: field:account.voucher.line,invoice_id:0
+msgid "Invoice"
+msgstr "Arve"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,end:0
+msgid "Cancel"
+msgstr "Katkesta"
+
+#. module: account_voucher_payment
+#: field:account.voucher,partner_id:0
+msgid "Partner"
+msgstr "Partner"
+
+#. module: account_voucher_payment
+#: wizard_button:account.voucher.unreconcile,init,unrec:0
+msgid "Unreconcile"
+msgstr ""
+
+#. module: account_voucher_payment
+#: wizard_view:account.voucher.unreconcile,init:0
+msgid "Unreconciliation"
+msgstr ""

addons/account_voucher_payment/test/account_voucher_payment.yml

@@ -0,0 +1,118 @@
+-
+  In order to test account_voucher_payment module in OpenERP I create an invoice and paid it through voucher
+-
+  I create a customer invoice record
+-
+  !record {model: account.invoice, id: account_invoice_voucher_payment}:
+    account_id: account.a_recv
+    address_contact_id: base.res_partner_address_3000
+    address_invoice_id: base.res_partner_address_3000
+    company_id: base.main_company
+    currency_id: base.EUR
+    invoice_line:
+      - account_id: account.a_sale
+        name: '[PC1] Basic PC'
+        price_unit: 450.0
+        quantity: 1.0
+        product_id: product.product_product_pc1
+        uos_id: product.product_uom_unit
+    journal_id: account.sales_journal
+    partner_id: base.res_partner_desertic_hispafuentes
+    reference_type: none
+
+-
+  I check that Initially customer invoice is in the "Draft" state
+-
+  !assert {model: account.invoice, id: account_invoice_voucher_payment}:
+    - state == 'draft'
+-
+  I change the state of invoice to "Proforma2" by clicking PRO-FORMA button
+-
+  !workflow {model: account.invoice, action: invoice_proforma2, ref: account_invoice_voucher_payment}
+-
+  I check that the invoice state is now "Proforma2"
+-
+  !assert {model: account.invoice, id: account_invoice_voucher_payment}:
+    - state == 'proforma2'
+-
+  I create invoice by clicking on Create button
+-
+  !workflow {model: account.invoice, action: invoice_open, ref: account_invoice_voucher_payment}
+-
+  I check that the invoice state is "Open"
+-
+  !assert {model: account.invoice, id: account_invoice_voucher_payment}:
+    - state == 'open'
+
+-
+   I create a voucher record for above invoice
+-
+  !record {model: account.voucher, id: account_voucher_voucherforaxelor1}:
+    account_id: account.cash
+    company_id: base.main_company
+    currency_id: base.EUR
+    journal_id: account.bank_journal
+    name: Voucher for Axelor
+    narration: Basic Pc
+    payment_ids:
+      - account_id: account.a_recv
+        amount: 450.0
+        name: Voucher for Axelor
+        partner_id: base.res_partner_desertic_hispafuentes
+        invoice_id: account_invoice_voucher_payment
+        type: cr
+    period_id: account.period_6
+    reference_type: none
+
+-
+  I check that Initially customer voucher is in the "Draft" state
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
+    - state == 'draft'
+-
+  I change the state of voucher to "proforma" by clicking PRO-FORMA button
+-
+  !workflow {model: account.voucher, action: open_voucher, ref: account_voucher_voucherforaxelor1}
+-
+  I check that the voucher state is now "proforma"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
+    - state == 'proforma'
+-
+  I create voucher by clicking on Create button
+-
+  !workflow {model: account.voucher, action: proforma_voucher, ref: account_voucher_voucherforaxelor1}
+-
+  I check that the voucher state is "Waiting for re-checking"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
+    - state == 'recheck'
+-
+  I clicked on Validate Button
+-
+  !workflow {model: account.voucher, action: recheck_voucher, ref: account_voucher_voucherforaxelor1}
+-
+  I check that the voucher state is "posted"
+-
+  !assert {model: account.voucher, id: account_voucher_voucherforaxelor1}:
+    - state == 'posted'
+
+-
+  I check that Moves get created for this voucher
+-
+  !python {model: account.voucher}: |
+    acc_id=self.browse(cr, uid, ref("account_voucher_voucherforaxelor1"))
+    assert(acc_id.move_id)
+
+-
+  I check that the invoice state is now Done
+-
+  !assert {model: account.invoice, id: account_invoice_voucher_payment}:
+    - state == 'paid'
+
+
+
+
+
+
+

addons/auction/__openerp__.py

@@ -32,6 +32,11 @@
      It completely manages an auction such as managing bids,
      keeping track of the sold articles along with the paid
      and unpaid objects including delivery of the articles.
+     Dashboards for auction that includes:
+       * My Latest Objects (list)
+       * My Latest Deposits (list)
+       * Objects Statistics (list)
+       * My Objects By Day (list)
     """,
     'author': 'Tiny',
     'depends': ['base', 'account', 'hr_attendance'],
@@ -54,12 +59,15 @@
 #        'wizard/auction_aie_send_result_view.xml',
         'wizard/auction_lots_buyer_map_view.xml',
 #        'wizard/auction_lots_numerotate_view.xml',
-        
+
         'auction_view.xml',
         'auction_report.xml',
-        'auction_wizard.xml'
+        'auction_wizard.xml',
+        'board_auction_view.xml',
+        'board_auction_manager_view.xml',
+
     ],
-    'demo_xml': ['auction_demo.xml'],
+    'demo_xml': ['auction_demo.xml','board_auction_demo.xml'],
     'installable': True,
     'active': False,
     'certificate': '0039333102717',

addons/auction/board_auction_manager_view.xml

@@ -69,13 +69,11 @@
             <field name="usage">menu</field>
             <field name="view_id" ref="board_auction_manager_form1"/>
         </record>
-        <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem name="Auction Manager" id="board_menu_auction_manager" parent="base.dashboard" />
         <menuitem
             name="Auction Manager"
             action="open_board_auction_manager"
             sequence="1"
-            id="menu_board_auction_manager" parent="board_menu_auction_manager"/>
+            id="menu_board_auction_manager"  icon="terp-graph" parent="menu_board_auction"/>
 
     </data>
 </openerp>

addons/auction/board_auction_view.xml

@@ -59,12 +59,12 @@
             <field name="view_id" ref="board_auction_manager_form"/>
         </record>
         <menuitem icon="terp-graph" id="base.dashboard" name="Dashboards" sequence="2" parent="base.reporting_menu"/>
-        <menuitem name="Auction Member" id="board_menu_auction_member" parent="base.dashboard" />
+        <menuitem name="Auction" id="menu_board_auction" parent="base.dashboard" />
         <menuitem
             name="Auction Member"
             action="open_board_auction"
-            sequence="1"
-            id="menu_board_auction" parent="board_menu_auction_member" />
+            sequence="2"
+            id="board_menu_auction_member" icon="terp-graph" parent="menu_board_auction" />
 
 </data>
 </openerp>

addons/auction/i18n/pl.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction

addons/auction/i18n/zh_CN.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction

addons/auction/report/auction_invoice.py

@@ -27,8 +27,7 @@ class auction_invoice(report_int):
         report_int.__init__(self, name)
 
     def create(self,cr, uid, ids, datas, context):
-        service = netsvc.LocalService("object_proxy")
-        lots = service.execute(cr.dbname,uid, 'auction.lots', 'read', ids, ['ach_inv_id'])
+        lots = self.pool.get('auction.lots').read(cr,uid, ids, ['ach_inv_id'], context=context)
 
         invoices = {}
         for l in lots:

addons/auction/test/auction.yml

@@ -0,0 +1,204 @@
+-
+  In order to test the auction module in the Open-ERP I start the process by creating a product.
+- 
+  I create a new product furniture.
+- 
+  !record {model: product.product, id: product_product_furniture0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Furniture
+    procure_method: make_to_stock
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  I create a new artist for an object. 
+- 
+  !record {model: auction.artists, id: auction_artists_vincentvangogh0}:
+    birth_death_dates: 1853-1900
+    name: Vincent van Gogh
+-
+  Now I want to associate an object with the auction so for that I create an auction "Antique furniture exhibition"
+-
+  !record {model: auction.dates, id: auction_dates_antiquefurnitureexhibition0}:
+    acc_expense: account.a_pay
+    acc_income: account.a_recv
+    account_analytic_id: account.analytic_root
+    auction1: '2010-05-20'
+    auction2: '2010-05-21'
+    expo1: '2010-05-18'
+    expo2: '2010-05-19'
+    journal_id: account.expenses_journal
+    journal_seller_id: account.sales_journal
+    name: Antique furniture exhibition  
+-
+  An object is being deposited for an auction,I create a seller's deposit record.  
+-
+  !record {model: auction.deposit, id: auction_deposit_ad0}:
+    date_dep: '2010-05-18'
+    method: keep
+    name: AD/006
+    partner_id: base.res_partner_4
+-
+  I create a new object wooden-chair which is to be auctioned.
+-
+  !record {model: auction.lots, id: auction_lots_woodenchair0}:
+    ach_uid: base.res_partner_2
+    artist_id: auction_artists_vincentvangogh0
+    auction_id: auction_dates_antiquefurnitureexhibition0
+    bord_vnd_id: auction_deposit_ad0
+    lot_est1: 3000.0
+    lot_est2: 5000.0
+    lot_num: 1
+    name: wooden-chair
+    name2: antique wooden chair
+    obj_num: 1
+    obj_price: 4000.0
+    obj_ret: 5000.0
+    product_id: 'product_product_furniture0'
+    state: draft
+    vnd_lim: 5000.0
+-
+  I create a bid for an object "wooden-chair" which is to be auctioned in Antique furniture exhibition.
+-
+  !record {model: auction.bid, id: auction_bid_bid0}:
+    auction_id: auction_dates_antiquefurnitureexhibition0
+    contact_tel: (+32)2 211 34 83
+    name: bid/001
+    partner_id: auction.partner_record1
+-
+  I create a bid line.
+-
+  !record {model: auction.bid_line, id: auction_bid_line_0}:
+    auction: Antique furniture exhibition
+    bid_id: auction_bid_bid0
+    lot_id: auction.auction_lots_woodenchair0
+    price: 3500.0
+-
+  I create another bid for an object "wooden-chair" bided by a different partner
+-  
+  !record {model: auction.bid, id: auction_bid_bid1}:
+    auction_id: auction_dates_antiquefurnitureexhibition0
+    name: bid/002
+    partner_id: base.res_partner_2
+-
+  I create a bid line.
+-
+  !record {model: auction.bid_line, id: auction_bid_line_1}:
+    auction: Antique furniture exhibition
+    bid_id: 'auction_bid_bid1'
+    call: 1
+    lot_id: auction.auction_lots_woodenchair0
+    price: 4000.0
+-
+  I check that buyer price and seller price gets bind with the value
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    assert(auc_id.buyer_price,auc_id.seller_price), _('Buyer price and seller price are not available!')
+-
+  I check that a record gets created in the Seller's Summary.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    auc_deposit_obj=self.pool.get('auction.deposit')
+    rep_sell_obj = self.pool.get('report.seller.auction')
+    ids =rep_sell_obj.search(cr, uid, [('auction', '=', auc_id.auction_id.id),('seller', '=',auc_id.bord_vnd_id.partner_id.id)])
+    assert ids, _('No record found!')
+-
+  I check that a record gets created in the Seller's Revenues.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    auc_deposit_obj=self.pool.get('auction.deposit')
+    rep_sell_obj = self.pool.get('report.seller.auction2')
+    ids =rep_sell_obj.search(cr, uid, [('auction', '=', auc_id.auction_id.id),('seller', '=',auc_id.bord_vnd_id.partner_id.id)])
+    assert ids, _('No record found!')
+-
+  I check that a record gets created in the Buyer's Summary.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id1=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    rep_buy_obj1 = self.pool.get('report.buyer.auction')
+    ids1=rep_buy_obj1.search(cr, uid, [('auction', '=', auc_id1.auction_id.id),('buyer', '=',auc_id1.ach_uid.id)])
+    assert ids1, _('No record found!')
+-
+  I check that a record gets created in the Buyer's Revenue.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id1=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    rep_buy_obj1 = self.pool.get('report.buyer.auction2')
+    ids1=rep_buy_obj1.search(cr, uid, [('auction', '=', auc_id1.auction_id.id),('buyer', '=',auc_id1.ach_uid.id)])
+    assert ids1, _('No record found!')
+-
+  I check that a record gets created in the Auction's Summary.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id2=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    rep_auc_obj1 = self.pool.get('report.auction.view')
+    ids2=rep_auc_obj1.search(cr, uid, [('auction_id', '=', auc_id2.auction_id.id)])
+    assert ids2, _('No record found!')
+-
+  I check that a record gets created in the Auction's Revenues.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id3=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    rep_auc_obj1 = self.pool.get('report.auction.view2')
+    ids3=rep_auc_obj1.search(cr, uid, [('auction', '=', auc_id3.auction_id.id)])
+    assert ids3, _('No record found!')
+-
+  An object has been sold,so I click on the "Sold" button.
+-
+  !python {model: auction.lots}: |
+    self.button_bought(cr, uid, [ref("auction_lots_woodenchair0")], {"lang": "en_US", "tz":
+      False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_lots_woodenchair0")],
+      "active_id": ref("auction.auction_lots_woodenchair0")})   
+-
+  I check that the order which was initially in the draft state has transit to sold state.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    assert(auc_id.state == 'sold'), _('State not changed!')
+-
+  Then I click on the Taken Away button.
+-
+  !python {model: auction.lots}: |
+    self.button_taken_away(cr, uid, [ref("auction_lots_woodenchair0")], {"lang":
+      "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids": [ref("auction.auction_all_objects_menu")],
+      "active_id": ref("auction.auction_all_objects_menu")})
+-
+  I check that the order which was initially in the sold state has transit to taken away state.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    assert(auc_id.state == 'taken_away'), _('State not changed!')
+-
+  I click on the "Close + Create all invoices" button
+-
+  !python {model: auction.dates}: |
+    self.close(cr, uid, [ref("auction.auction_dates_antiquefurnitureexhibition0")],
+      {"lang": "en_US", "tz": False, "active_model": "ir.ui.menu", "active_ids":
+      [ref("auction.menu_auction_dates_next1")], "active_id": ref("auction.menu_auction_dates_next1")})
+-
+  I check that a record gets created in the "Supplier Invoices".
+-
+ !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
+    assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!') 

addons/auction/test/auction_wizard.yml

@@ -0,0 +1,248 @@
+-
+  In order to test the wizards of auction module I create a new record.
+-
+  I start the process by creating a new product Paintings.
+- 
+  !record {model: product.product, id: product_product_paintings0}:
+    categ_id: product.cat1
+    cost_method: standard
+    mes_type: fixed
+    name: Paintings
+    procure_method: make_to_stock
+    standard_price: 1.0
+    supply_method: buy
+    type: product
+    uom_id: product.product_uom_unit
+    uom_po_id: product.product_uom_unit
+    volume: 0.0
+    warranty: 0.0
+    weight: 0.0
+    weight_net: 0.0
+-
+  I create a new artist-Picasso's record.   
+- 
+  !record {model: auction.artists, id: auction_artists_picasso0}:
+    birth_death_dates: 1881-1973
+    name: Picasso
+-
+  Now I want to associate an object with the auction so for that I create an auction "Picasso's painting exhibition"
+-
+  !record {model: auction.dates, id: auction_dates_picassospaintingexhibition0}:
+    acc_expense: account.a_pay
+    acc_income: account.a_recv
+    account_analytic_id: account.analytic_root
+    auction1: '2010-05-24'
+    auction2: '2010-05-25'
+    expo1: '2010-05-21'
+    expo2: '2010-05-22'
+    journal_id: account.expenses_journal
+    journal_seller_id: account.sales_journal
+    name: Picasso's painting exhibition
+-
+  An object is being deposited for an auction,I create a seller's deposit record.
+-
+  !record {model: auction.deposit, id: auction_deposit_ad1}:
+    date_dep: '2010-05-18'
+    method: keep
+    name: AD/007
+    partner_id: base.res_partner_9
+-
+  I create a new object painting which is to be auctioned.
+-
+  !record {model: auction.lots, id: auction_lots_painting0}:
+    ach_login: 'Mr.Chang'
+    artist_id: auction.auction_artists_picasso0
+    auction_id: auction_dates_picassospaintingexhibition0
+    bord_vnd_id: auction_deposit_ad1
+    lot_est1: 2000.0
+    lot_est2: 4000.0
+    lot_num: 2
+    name: painting
+    name2: picasso_painting
+    obj_num: 2
+    obj_price: 3500.0
+    obj_ret: 4000.0
+    product_id: auction.product_product_paintings0
+    state: draft
+    vnd_lim: 4000.0
+-
+  I assign the buyer through "Map buyer user name to Partners" wizard.
+-
+  !record {model: auction.lots.buyer_map, id: auction_lots_buyer_map_0}:
+    ach_login: 'Mr.Chang'
+    ach_uid: base.res_partner_3
+- 
+  I click on the "Update" button.
+- 
+  !python {model: auction.lots.buyer_map}: |
+    auc_obj=self.pool.get('auction.lots')
+    ids=self.browse(cr, uid, ref("auction_lots_painting0"))
+    self.buyer_map_set(cr, uid, [ref("auction_lots_buyer_map_0")], {"lang": "en_US",
+      "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "active_id": ref("auction_lots_painting0")})
+-
+  I check that the buyer field gets bind with the value.
+-
+ !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.ach_uid), _('Buyer not assigned!')
+-
+  I mark that a seller has been paid by using the "Mark as paid for seller" wizard.
+-
+  !record {model: auction.payer.sel, id: auction_payer_sel_0}:
+    {}
+-
+  I click on the "Pay" button.
+- 
+  !python {model: auction.payer.sel}: |
+    self.payer_sel(cr, uid, [ref("auction_payer_sel_0")], {"lang": "en_US", "tz":
+      False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")], "active_id": ref("auction_lots_painting0")})
+-
+  I check that the Seller paid field is set to True.
+-
+ !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.paid_vnd == True), _('Seller paid is not marked!') 
+-
+  I use the "Mark as taken away" wizard to indicate that an object is taken away.
+- 
+  !record {model: auction.lots.able, id: auction_lots_able_0}:
+    {}
+- 
+  Then I click on the "Able Taken away" wizard.
+- 
+  !python {model: auction.lots.able}: |
+    self.confirm_able(cr, uid, [ref("auction_lots_able_0")], {"lang":"en_US", "tz":
+      False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "active_id": ref("auction_lots_painting0")})
+-
+  I check that Taken away field is set to True.
+-
+ !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.ach_emp == True), _('Taken away is not marked!') 
+-
+  I use the "Unmark as taken away" wizard to unmark the Taken Away field.
+-
+  !record {model: auction.lots.enable, id: auction_lots_enable_0}:
+    confirm_en: 0.0
+- 
+  Then I click on the "Enable Taken away" button.
+- 
+  !python {model: auction.lots.enable}: |
+    self.confirm_enable(cr, uid, [ref("auction_lots_enable_0")], {"lang": "en_US",
+      "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "active_id": ref("auction_lots_painting0"),})
+-
+  I check that Taken away field is set to False.
+-
+ !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.ach_emp == False), _('Taken away is marked!') 
+-
+  I create statement lines for an object's payment by using the "Pay objects of the buyer" wizard
+-
+  I create a bank statement.
+-
+  !record {model: account.bank.statement, id: account_bank_statement_st0}:
+    balance_end_real: 0.0
+    date: '2010-05-19'
+    journal_id: account.bank_journal
+    name: St. 05/19
+    period_id: account.period_5
+    state: draft
+-
+  I create auction payment record.
+-
+  !record {model: auction.pay.buy, id: auction_pay_buy_0}:
+    amount: 2000.0
+    amount2: 1000.0
+    amount3: 1000.0
+    buyer_id: base.res_partner_2
+    statement_id1: account_bank_statement_st0
+    statement_id2: account_bank_statement_st0
+    statement_id3: account_bank_statement_st0
+    total: 4000.0
+-
+  Then I click "Pay" button.
+-
+  !python {model: auction.pay.buy}: |
+    self.pay_and_reconcile(cr, uid, [ref("auction_pay_buy_0")], {"lang": "en_US", "tz":
+      False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "active_id": ref("auction_lots_painting0"),})    
+-
+  I check that a record gets created in the 'auction_statement_line_rel' table 
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    cr.execute("select statement from auction_statement_line_rel,auction_lots where auction_lots.id=auction_statement_line_rel.auction_id AND auction_lots.name='painting'")
+    ans=cr.fetchall() 
+    assert ans, _('statement_id not found!') 
+-
+  I create the seller's invoice by using the "Invoice Seller objects" wizard.
+-  
+  !record {model: auction.lots.make.invoice, id: auction_lots_make_invoice_0}:
+    amount: 3500.0
+    number: 2010/002
+    objects: 1
+-
+  Then I click on the "Create Invoices" button.
+-
+  !python {model: auction.lots.make.invoice}: |
+    self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_0")], {"lang": "en_US",
+      "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "tz": False, "active_id": ref("auction_lots_painting0"),})
+-
+  I check that a "Seller Invoice" field gets bind with the value.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.sel_inv_id), _('Seller Invoice has not been created!') 
+-
+  I create a buyer's invoice by using the "Invoice Buyer objects" wizard.
+-
+  !record {model: auction.lots.make.invoice.buyer, id: auction_lots_make_invoice_buyer_0}:
+    amount: 3500.0
+    buyer_id: base.res_partner_3
+    number: 2010/003
+    objects: 1
+-
+  Then I click on the "Create Invoices" button.
+-
+  !python {model: auction.lots.make.invoice.buyer}: |
+    self.makeInvoices(cr, uid, [ref("auction_lots_make_invoice_buyer_0")], {"lang":
+      "en_US", "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "tz": False, "active_id": ref("auction_lots_painting0"), })
+-
+  I check that a "Buyer Invoice" field gets bind with the value.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    assert(auc_id.ach_inv_id), _('Seller Invoice has not been created!') 
+-
+  In order to change the auction for an object I use the "Change auction date" wizard.
+-
+  !record {model: auction.lots.auction.move, id: auction_lots_auction_move_0}:
+    auction_id: auction.auction_date_2
+- 
+  Then I click on the "Move to Auction date" button.
+- 
+  !python {model: auction.lots.auction.move}: |
+    self.auction_move_set(cr, uid, [ref("auction_lots_auction_move_0")], {"lang":
+      "en_US", "tz": False, "active_model": "auction.lots", "active_ids": [ref("auction_lots_painting0")],
+      "active_id": ref("auction_lots_painting0"), })
+-
+  I check that a record gets created in the lot history.
+-
+  !python {model: auction.lots}: |
+    from tools.translate import _
+    auc_id=self.browse(cr, uid, ref("auction_lots_painting0"))
+    auc_lot_his=self.pool.get('auction.lot.history')
+    ids=auc_lot_his.search(cr, uid, [('lot_id', '=', auc_id.id)])
+    assert ids, _('Auction history does not exists!')     

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

@@ -1,2 +1,3 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_base_action_rule","base.action.rule","model_base_action_rule",,1,1,1,1
+"access_base_action_rule","base.action.rule","model_base_action_rule",,1,0,0,0
+"access_base_action_rule_config","base.action.rule config","model_base_action_rule",base.group_system,1,0,0,0

addons/base_calendar/base_calendar_view.xml

@@ -2,7 +2,7 @@
 <openerp>
     <data>
 
-		<!--		Attendee form view-->
+        <!--        Attendee form view-->
 
         <record id="base_calendar_attendee_form_view" model="ir.ui.view">
             <field name="name">calendar.attendee.form</field>
@@ -10,12 +10,12 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Invitation details">
-                	<group col="6" colspan="4">
-	                    <field name="email" string="Invitation To"/>
-	                    <field name="cutype" string="Invitation type" />
+                    <group col="6" colspan="4">
+                        <field name="email" string="Invitation To"/>
+                        <field name="cutype" string="Invitation type" />
                         <field name="rsvp" />
                         <field name="role" string="Role" />
-	                    <field name="sent_by_uid" string="Invitation From" />
+                        <field name="sent_by_uid" string="Invitation From" />
                     </group>
                     <notebook colspan="4">
                         <page string="Invitation">
@@ -68,7 +68,7 @@
             </field>
         </record>
 
-		<!--		Attendee tree view-->
+        <!--        Attendee tree view-->
 
         <record id="base_calendar_attendee_tree_view" model="ir.ui.view">
             <field name="name">calendar.attendee.tree</field>
@@ -87,7 +87,7 @@
             </field>
         </record>
 
-		<!--		Attendee search view-->
+        <!--        Attendee search view-->
 
         <record id="base_calendar_attendee_search_view" model="ir.ui.view">
             <field name="name">calendar.attendee.search</field>
@@ -103,52 +103,52 @@
                        separator="1" help="Declined Invitations" />
                    <separator orientation="vertical"/>
                    <field name="email" select='1'/>
-                   <field name="sent_by_uid" select="1" widget="selection"/>
+                   <field name="sent_by_uid" select="1"/>
                    <separator orientation="vertical"/>
                    <field name="cutype" string="Invitation type" select="1"/>
                    <field name="event_date" select="1"/>
                    <newline/>
-				    <group expand="0" string="Group By...">
-						<filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
-					        domain="[]" context="{'group_by':'cutype'}" />
-					    <filter string="Role" icon="terp-gtk-select-all"
-					        domain="[]" context="{'group_by':'role'}" />
-					    <filter string="Required Reply" icon="terp-mail-replied"
-					        domain="[]" context="{'group_by':'rsvp'}" />
-					    <separator orientation="vertical" />
-					    <filter string="User" icon="terp-personal" domain="[]"
-					        context="{'group_by':'user_id'}" />
-					    <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
-					        context="{'group_by':'partner_address_id'}" />
-					    <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
+                    <group expand="0" string="Group By...">
+                        <filter string="Type" icon="terp-stock_symbol-selection" help="Invitation Type"
+                            domain="[]" context="{'group_by':'cutype'}" />
+                        <filter string="Role" icon="terp-gtk-select-all"
+                            domain="[]" context="{'group_by':'role'}" />
+                        <filter string="Required Reply" icon="terp-mail-replied"
+                            domain="[]" context="{'group_by':'rsvp'}" />
+                        <separator orientation="vertical" />
+                        <filter string="User" icon="terp-personal" domain="[]"
+                            context="{'group_by':'user_id'}" />
+                        <filter string="Contact" icon="terp-gtk-jump-to-ltr" domain="[]"
+                            context="{'group_by':'partner_address_id'}" />
+                        <filter string="State" icon="terp-stock_effects-object-colorize" help="Invitation Type"
                             domain="[]" context="{'group_by':' state'}" />
-					</group>
+                    </group>
                </search>
             </field>
         </record>
-		<record id="action_view_attendee_form" model="ir.actions.act_window">
-	         <field name="name">Event Invitations</field>
-	         <field name="type">ir.actions.act_window</field>
-	         <field name="res_model">calendar.attendee</field>
-	         <field name="view_type">form</field>
-	         <field name="view_mode">tree,form</field>
-	         <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
-	         <field name="context">{'default_sent_by_uid': uid}</field>
-	     </record>
+        <record id="action_view_attendee_form" model="ir.actions.act_window">
+             <field name="name">Event Invitations</field>
+             <field name="type">ir.actions.act_window</field>
+             <field name="res_model">calendar.attendee</field>
+             <field name="view_type">form</field>
+             <field name="view_mode">tree,form</field>
+             <field name="view_id" ref="base_calendar.base_calendar_attendee_tree_view" />
+             <field name="context">{'default_sent_by_uid': uid}</field>
+         </record>
 
-		<!-- Calenadar's menu -->
+        <!-- Calenadar's menu -->
           <menuitem id="base.menu_calendar_configuration" name="Calendar"
-            parent="base.menu_config_address_book" sequence="15" />
+            parent="base.menu_base_config" sequence="15" />
 
-		<!-- Invitation menu -->
+        <!-- Invitation menu -->
 
-	       <menuitem id="menu_attendee_invitations"
+           <menuitem id="menu_attendee_invitations"
             name="Event Invitations" parent="base.menu_calendar_configuration"
             sequence="10" action="action_view_attendee_form" />
 
-		<!--		ALARM FORM VIEW-->
+        <!--        ALARM FORM VIEW-->
 
-		<record id="res_alarm_form_view" model="ir.ui.view">
+        <record id="res_alarm_form_view" model="ir.ui.view">
             <field name="name">res.alarm.form</field>
             <field name="model">res.alarm</field>
             <field name="type">form</field>
@@ -165,7 +165,7 @@
             </field>
         </record>
 
-		<!--		ALARM TREE VIEW-->
+        <!--        ALARM TREE VIEW-->
 
         <record id="res_alarm_tree_view" model="ir.ui.view">
             <field name="name">res.alarm.tree</field>
@@ -189,198 +189,199 @@
             <field name="view_mode">tree,form</field>
         </record>
 
-		<!--		Menu for Alarms-->
+        <!--        Menu for Alarms-->
 
          <menuitem id="menu_crm_meeting_avail_alarm"
             groups="base.group_extended"
             action="base_calendar.action_res_alarm_view"
             parent="base.menu_calendar_configuration" />
+
         <!-- Event Form View-->
 
-		<record model="ir.ui.view" id="event_form_view">
-	        <field name="name">Event Form</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">form</field>
-	        <field name="arch" type="xml">
-	            <form string="Events">
-	                <group col="6" colspan="4">
-	                    <field name="name" select="1" string="Summary"
-	                        colspan="4" />
-	                    <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
-	                    <newline/>
-	                    <field name="date" string="Start Date" required="1" select="1"
-	                    	on_change="onchange_dates(date,duration,False,allday)" />
-	                    <field name="duration" widget="float_time"
-	                    	on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
-	                    <field name="date_deadline" string="End Date" required="1"
-	                    	on_change="onchange_dates(date,False,date_deadline)" />
-	                    <field name="location" />
-	                    <field name="alarm_id" string="Reminder"
-	                    	widget="selection" />
-	                    <group colspan="2" col="4" >
-	                           <field name="rrule_type" string="Recurrency"
-	                                colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
-	                           <button string="Edit All"
-	                           	help="Edit all Ourrences of recurrent Meeting"
-	                           	attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
-	                           	name="open_event" icon="gtk-edit"
-	                           	type="object" />
-	                    </group>
-	                </group>
-	                <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
-	                    <separator string="Select data for Custom Rule" colspan="8"/>
-	                    <group col="8" colspan="4">
-	                        <field name="freq" />
-	                        <field name="interval" />
-	                        <field name="count" />
-	                        <field name="end_date" />
-	                    </group>
-	                    <group col="14" colspan="4" name="Select weekdays"
-	                        attrs="{'invisible' : [('freq','!=','weekly')]}">
-	                        <field name="mo" colspan="1" />
-	                        <field name="tu" colspan="1" />
-	                        <field name="we" colspan="1" />
-	                        <field name="th" colspan="1" />
-	                        <field name="fr" colspan="1" />
-	                        <field name="sa" colspan="1" />
-	                        <field name="su" colspan="1" />
-	                        <newline />
-	                    </group>
-	                    <group col="10" colspan="4"
-	                        attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
-	                        <group col="2" colspan="1">
-	                            <field name="select1" />
-	                        </group>
-	                        <group col="2" colspan="1"
-	                            attrs="{'invisible' : [('select1','=','day')]}">
-	                            <field name="day"
-	                                attrs="{'required' : [('select1','=','date')]}" />
-	                        </group>
-	                        <group col="3" colspan="1"
-	                            attrs="{'invisible' : [('select1','=','date')]}">
-	                            <field name="byday" string="The"
-	                                attrs="{'required' : [('select1','=','day')]}" />
-	                            <field name="week_list" nolabel="1"
-	                                attrs="{'required' : [('select1','=','day')]}" />
-	                        </group>
-	                        <group col="1" colspan="1"
-	                            attrs="{'invisible' : [('freq','!=','yearly')]}">
-	                            <field name="month_list" string="of"
-	                                colspan="1"
-	                                attrs="{'required' : [('freq','=','yearly')]}" />
-	                        </group>
-	                    </group>
-	                </group>
-	                <notebook colspan="4">
-	                <page string="Event">
-	                    <group col="6" colspan="4">
-	                         <separator colspan="6" string="Visibility"/>
-	                         <field name="user_id" string="Responsible User" />
-	                         <field name="show_as" string="Show time as"/>
-	                         <field name="class" string="Privacy"/>
-	                         <field name="recurrent_id" invisible="1" />
-	                         <field name="recurrent_uid" invisible="1" />
-	                    </group>
-	                    <separator string="Description" colspan="4" />
-	                    <field name="description" nolabel="1" colspan="4" />
-	                    <separator colspan="4"/>
-	                    </page>
-	                    <page string="Invitation Detail">
-	                        <button string="Invite People"
-	                            name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-	                            icon="terp-partner" type="action"
-	                            context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
-	                        <field name="attendee_ids" colspan="4"
-	                            nolabel="1" widget="one2many" mode="tree,form">
-	                            <tree string="Invitation details" editable="top">
-	                                <field name="email" />
-	                                <field name="role" width="200" select="1" />
-	                                <field name="state" />
-	                            </tree>
-	                            <form string="Invitation details">
-	                                <notebook colspan="4">
-	                                    <page string="Details">
-	                                        <field name="email" />
-	                                        <field name="rsvp" select="1" />
-	                                        <field name="cutype" select="1" />
-	                                        <field name="role" select="1" />
-	                                        <separator colspan="4" string="" />
-	                                        <group col="6" colspan="4">
-	                                            <field name="state" select="2" />
-	                                            <button name="do_tentative"
-	                                            	states="needs-action,declined,accepted"
-	                                            	string="Uncertain"
-	                                            	type="object"
-	                                            	icon="terp-crm" />
-	                                            <button name="do_accept"
-	                                            	string="Accept"
-	                                            	states="needs-action,tentative,declined"
-	                                            	type="object"
-	                                            	icon="gtk-apply" />
-	                                            <button name="do_decline"
-	                                            	string="Decline"
-	                                            	states="needs-action,tentative,accepted"
-	                                            	type="object"
-	                                            	icon="gtk-cancel" />
-	                                            <button
-	                                            	name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
-	                                            	string="Delegate"
-	                                            	type="action"
-	                                            	icon="gtk-sort-descending"
-	                                            	states="needs-action,tentative,declined,accepted"
-	                                            	context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
-	                                        </group>
-	                                    </page>
-	                                </notebook>
-	                            </form>
-	                        </field>
-	                    </page>
-	                </notebook>
-	            </form>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_form_view">
+            <field name="name">Event Form</field>
+            <field name="model">calendar.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name" select="1" string="Summary"
+                            colspan="4" />
+                        <field name="allday" colspan="2" on_change="onchange_allday(allday)" />
+                        <newline/>
+                        <field name="date" string="Start Date" required="1" select="1"
+                            on_change="onchange_dates(date,duration,False,allday)" />
+                        <field name="duration" widget="float_time"
+                            on_change="onchange_dates(date,duration,False,allday)" attrs="{'invisible': [('allday', '=', True)]}"/>
+                        <field name="date_deadline" string="End Date" required="1"
+                            on_change="onchange_dates(date,False,date_deadline)" />
+                        <field name="location" />
+                        <field name="alarm_id" string="Reminder"
+                            widget="selection" />
+                        <group colspan="2" col="4" >
+                               <field name="rrule_type" string="Recurrency"
+                                    colspan="1" attrs="{'readonly':[('recurrent_uid','!=',False)]}"/>
+                               <button string="Edit All"
+                                   help="Edit all Ourrences of recurrent Meeting"
+                                   attrs="{'invisible':[('rrule_type','in', ('none', False))]}"
+                                   name="open_event" icon="gtk-edit"
+                                   type="object" />
+                        </group>
+                    </group>
+                    <group col="4" colspan="4" name="rrule" attrs="{'invisible': [('rrule_type','!=','custom')]}">
+                        <separator string="Select data for Custom Rule" colspan="8"/>
+                        <group col="8" colspan="4">
+                            <field name="freq" />
+                            <field name="interval" />
+                            <field name="count" />
+                            <field name="end_date" />
+                        </group>
+                        <group col="14" colspan="4" name="Select weekdays"
+                            attrs="{'invisible' : [('freq','!=','weekly')]}">
+                            <field name="mo" colspan="1" />
+                            <field name="tu" colspan="1" />
+                            <field name="we" colspan="1" />
+                            <field name="th" colspan="1" />
+                            <field name="fr" colspan="1" />
+                            <field name="sa" colspan="1" />
+                            <field name="su" colspan="1" />
+                            <newline />
+                        </group>
+                        <group col="10" colspan="4"
+                            attrs="{'invisible' : [('freq','!=','monthly'), ('freq','!=','yearly')]}">
+                            <group col="2" colspan="1">
+                                <field name="select1" />
+                            </group>
+                            <group col="2" colspan="1"
+                                attrs="{'invisible' : [('select1','=','day')]}">
+                                <field name="day"
+                                    attrs="{'required' : [('select1','=','date')]}" />
+                            </group>
+                            <group col="3" colspan="1"
+                                attrs="{'invisible' : [('select1','=','date')]}">
+                                <field name="byday" string="The"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                                <field name="week_list" nolabel="1"
+                                    attrs="{'required' : [('select1','=','day')]}" />
+                            </group>
+                            <group col="1" colspan="1"
+                                attrs="{'invisible' : [('freq','!=','yearly')]}">
+                                <field name="month_list" string="of"
+                                    colspan="1"
+                                    attrs="{'required' : [('freq','=','yearly')]}" />
+                            </group>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                    <page string="Event">
+                        <group col="6" colspan="4">
+                             <separator colspan="6" string="Visibility"/>
+                             <field name="user_id" string="Responsible User" />
+                             <field name="show_as" string="Show time as"/>
+                             <field name="class" string="Privacy"/>
+                             <field name="recurrent_id" invisible="1" />
+                             <field name="recurrent_uid" invisible="1" />
+                        </group>
+                        <separator string="Description" colspan="4" />
+                        <field name="description" nolabel="1" colspan="4" />
+                        <separator colspan="4"/>
+                        </page>
+                        <page string="Invitation Detail">
+                            <button string="Invite People"
+                                name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                icon="terp-partner" type="action"
+                                context="{'model' : 'calendar.event', 'attendee_field':'attendee_ids'}" colspan="2"/>
+                            <field name="attendee_ids" colspan="4"
+                                nolabel="1" widget="one2many" mode="tree,form">
+                                <tree string="Invitation details" editable="top">
+                                    <field name="email" />
+                                    <field name="role" width="200" select="1" />
+                                    <field name="state" />
+                                </tree>
+                                <form string="Invitation details">
+                                    <notebook colspan="4">
+                                        <page string="Details">
+                                            <field name="email" />
+                                            <field name="rsvp" select="1" />
+                                            <field name="cutype" select="1" />
+                                            <field name="role" select="1" />
+                                            <separator colspan="4" string="" />
+                                            <group col="6" colspan="4">
+                                                <field name="state" select="2" />
+                                                <button name="do_tentative"
+                                                    states="needs-action,declined,accepted"
+                                                    string="Uncertain"
+                                                    type="object"
+                                                    icon="terp-crm" />
+                                                <button name="do_accept"
+                                                    string="Accept"
+                                                    states="needs-action,tentative,declined"
+                                                    type="object"
+                                                    icon="gtk-apply" />
+                                                <button name="do_decline"
+                                                    string="Decline"
+                                                    states="needs-action,tentative,accepted"
+                                                    type="object"
+                                                    icon="gtk-cancel" />
+                                                <button
+                                                    name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
+                                                    string="Delegate"
+                                                    type="action"
+                                                    icon="gtk-sort-descending"
+                                                    states="needs-action,tentative,declined,accepted"
+                                                    context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
+                                            </group>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                    </notebook>
+                </form>
+            </field>
+        </record>
 
-		<!-- Event Tree View  -->
+        <!-- Event Tree View  -->
 
-		<record model="ir.ui.view" id="event_tree_view">
-	        <field name="name">Event Tree</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">tree</field>
-	        <field name="arch" type="xml">
-	            <tree string="Events">
-	            	<field name="name" string="Subject" />
-	            	<field name="date" string="Meeting Date" />
-	            	<field name="location" />
-	            	<field name="show_as" />
-	            	<field name="class" string="Privacy" />
-	            	<field name="user_id" invisible="1"/>
-	            </tree>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_tree_view">
+            <field name="name">Event Tree</field>
+            <field name="model">calendar.event</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Events">
+                    <field name="name" string="Subject" />
+                    <field name="date" string="Meeting Date" />
+                    <field name="location" />
+                    <field name="show_as" />
+                    <field name="class" string="Privacy" />
+                    <field name="user_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
 
-		<!-- Event Calendar View  -->
+        <!-- Event Calendar View  -->
 
-		<record model="ir.ui.view" id="event_calendar_view">
-	        <field name="name">Events Calendar</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">calendar</field>
-	        <field name="priority" eval="2"/>
-	        <field name="arch" type="xml">
-	            <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
-	                <field name="name"/>
-	                <field name="class"/>
-	                <field name="show_as"/>
-	            </calendar>
-	        </field>
-	    </record>
+        <record model="ir.ui.view" id="event_calendar_view">
+            <field name="name">Events Calendar</field>
+            <field name="model">calendar.event</field>
+            <field name="type">calendar</field>
+            <field name="priority" eval="2"/>
+            <field name="arch" type="xml">
+                <calendar string="Events" date_start="date" color="show_as" date_delay="duration">
+                    <field name="name"/>
+                    <field name="class"/>
+                    <field name="show_as"/>
+                </calendar>
+            </field>
+        </record>
 
-		<!--	 Event Search View-->
+        <!--     Event Search View-->
 
-	    <record id="view_calendar_event_filter" model="ir.ui.view">
-	        <field name="name">Calendar Events Search</field>
-	        <field name="model">calendar.event</field>
-	        <field name="type">search</field>
-	        <field name="arch" type="xml">
+        <record id="view_calendar_event_filter" model="ir.ui.view">
+            <field name="name">Calendar Events Search</field>
+            <field name="model">calendar.event</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
                 <search string="Search Events">
                        <group col="12" colspan="4">
                            <filter icon="terp-go-today" string="My Events"
@@ -390,42 +391,42 @@
                            <field name="name" select="1" string="Summary"/>
                            <field name="location" select="1" string="Location"/>
                            <separator orientation="vertical"/>
-                           <field name="user_id" select="1" widget="selection"/>
+                           <field name="user_id" select="1"/>
                            <separator orientation="vertical"/>
                            <field name="show_as" select="1"/>
                            <field name="class" select="1"/>
                        </group>
                        <newline/>
-						<group expand="0" string="Group By...">
-							<filter string="Date" icon="terp-go-month"
-						        domain="[]" context="{'group_by':'date'}" />
-						    <filter string="Availability" icon="terp-camera_test"
-						        domain="[]" context="{'group_by':'show_as'}" />
-						    <filter string="Privacy" icon="terp-locked"
-						        domain="[]" context="{'group_by':'class'}" />
-						    <separator orientation="vertical" />
-						    <filter string="Responsible" icon="terp-personal" domain="[]"
-						        context="{'group_by':'user_id'}" />
-						</group>
+                        <group expand="0" string="Group By...">
+                            <filter string="Date" icon="terp-go-month"
+                                domain="[]" context="{'group_by':'date'}" />
+                            <filter string="Availability" icon="terp-camera_test"
+                                domain="[]" context="{'group_by':'show_as'}" />
+                            <filter string="Privacy" icon="terp-locked"
+                                domain="[]" context="{'group_by':'class'}" />
+                            <separator orientation="vertical" />
+                            <filter string="Responsible" icon="terp-personal" domain="[]"
+                                context="{'group_by':'user_id'}" />
+                        </group>
                 </search>
             </field>
-		</record>
+        </record>
 
 
-	    <!-- Event action  -->
+        <!-- Event action  -->
 
-		<record id="action_view_event" model="ir.actions.act_window">
-	            <field name="name">Events</field>
-	            <field name="type">ir.actions.act_window</field>
-	            <field name="res_model">calendar.event</field>
-	            <field name="view_type">form</field>
-	            <field name="view_mode">tree,form,calendar</field>
-	            <field name="search_view_id" ref="view_calendar_event_filter"/>
-	        </record>
+        <record id="action_view_event" model="ir.actions.act_window">
+                <field name="name">Events</field>
+                <field name="type">ir.actions.act_window</field>
+                <field name="res_model">calendar.event</field>
+                <field name="view_type">form</field>
+                <field name="view_mode">tree,form,calendar</field>
+                <field name="search_view_id" ref="view_calendar_event_filter"/>
+            </record>
 
-		<!-- Event menu  -->
+        <!-- Event menu  -->
 
-		  <menuitem id="menu_events"
+        <menuitem id="menu_events"
                 name="Events" parent="base.menu_calendar_configuration"
                 sequence="5" action="action_view_event" />
 

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

@@ -1,9 +1,9 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_calendar_attendee","calendar.attendee","model_calendar_attendee",,1,1,1,1
-"access_calendar_alarm","calendar.alarm","model_calendar_alarm",,1,1,1,1
-"access_res_alarm","res.alarm","model_res_alarm",,1,1,1,1
-"access_calendar_event_all","calendar.event","model_calendar_event",,1,1,1,1
-"access_calendar_todo","calendar.todo","model_calendar_todo",,1,1,1,1
-"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",,1,1,1,1
-"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",,1,1,1,1
-"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",,1,1,1,1
+"access_calendar_attendee","calendar.attendee","model_calendar_attendee",base.group_user,1,1,1,1
+"access_calendar_alarm","calendar.alarm","model_calendar_alarm",base.group_user,1,1,1,1
+"access_res_alarm","res.alarm","model_res_alarm",base.group_user,1,1,1,1
+"access_calendar_event_all","calendar.event","model_calendar_event",base.group_user,1,1,1,1
+"access_calendar_todo","calendar.todo","model_calendar_todo",base.group_user,1,1,1,1
+"access_base_calendar_invite_attendee","base_calendar.invite.attendee","model_base_calendar_invite_attendee",base.group_user,1,1,1,1
+"access_calendar_event_edit_all","calendar_event_edit_all","model_calendar_event_edit_all",base.group_user,1,1,1,1
+"access_base_calendar_set_exrule","base.calendar.set.exrule","model_base_calendar_set_exrule",base.group_user,1,1,1,1

addons/base_module_quality/i18n/zh_CN.po

@@ -8,19 +8,19 @@ 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-03-17 14:08+0000\n"
-"Last-Translator: 英华 <wantinghard@gmail.com>\n"
+"PO-Revision-Date: 2010-06-09 16:41+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@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-04-17 04:20+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_module_quality
 #: field:module.quality.check,final_score:0
 msgid "Final Score (%)"
-msgstr ""
+msgstr "最终评分（%）"
 
 #. module: base_module_quality
 #: constraint:ir.model:0

addons/base_report_designer/i18n/hr.po

@@ -13,7 +13,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-08 03:41+0000\n"
+"X-Launchpad-Export-Date: 2010-06-11 03:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: hr\n"