[MERGE] merged the team 3 branch

bzr revid: qdp-launchpad@tinyerp.com-20101122121128-0cxd7ptuc4g0tr5x

addons/account/report/account_partner_ledger.py

@@ -28,6 +28,7 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context=None):
         super(third_party_ledger, self).__init__(cr, uid, name, context=context)
+        self.init_bal_sum = 0.0
         self.localcontext.update({
             'time': time,
             'lines': self.lines,
@@ -152,8 +153,10 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
                 (partner.id, tuple(self.account_ids), tuple(move_state)))
         res = self.cr.dictfetchall()
         sum = 0.0
+        if self.initial_balance:
+            sum = self.init_bal_sum
         for r in res:
-            sum = r['debit'] - r['credit']
+            sum += r['debit'] - r['credit']
             r['progress'] = sum
             full_account.append(r)
         return full_account
@@ -178,7 +181,9 @@ class third_party_ledger(report_sxw.rml_parse, common_report_header):
             " " + RECONCILE_TAG + " "\
             "AND " + self.init_query + "  ",
             (partner.id, tuple(move_state), tuple(self.account_ids)))
-        return self.cr.fetchall()
+        res = self.cr.fetchall()
+        self.init_bal_sum = res[0][2]
+        return res
 
     def _sum_debit_partner(self, partner):
         move_state = ['draft','posted']
@@ -414,4 +419,4 @@ report_sxw.report_sxw('report.account.third_party_ledger_other', 'res.partner',
         'addons/account/report/account_partner_ledger_other.rml',parser=third_party_ledger,
         header='internal')
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_sequence/__openerp__.py

@@ -37,4 +37,4 @@
     'certificate': '',
 }
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_sequence/account_sequence.py

@@ -26,7 +26,7 @@ class account_move(osv.osv):
     _inherit = 'account.move'
 
     _columns = {
-        'internal_sequence_number': fields.char('Internal Sequence Number', size=64, readonly=True),
+        'internal_sequence_number': fields.char('Internal Number', size=64, readonly=True, help='Internal Sequence Number'),
     }
 
     def post(self, cr, uid, ids, context=None):
@@ -34,7 +34,6 @@ class account_move(osv.osv):
         res = super(account_move, self).post(cr, uid, ids, context=context)
         seq_no = False
         for line in self.browse(cr, uid, ids):
-            # Todo: if there is not internal seq defined on journal raise error ?
             if line.journal_id.internal_sequence:
                 seq_no = obj_sequence.get_id(cr, uid, line.journal_id.internal_sequence.id, context=context)
             if seq_no:
@@ -52,4 +51,11 @@ class account_journal(osv.osv):
 
 account_journal()
 
+class account_move_line(osv.osv):
+    _inherit = "account.move.line"
+
+    _columns = {
+        'internal_sequence_number': fields.related('move_id','internal_sequence_number', type='char', relation='account.move', help='Internal Sequence Number', string='Internal Number'),
+    }
+account_move_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account_sequence/account_sequence.xml

@@ -2,29 +2,80 @@
 <openerp>
     <data>
 
-    <record id="view_account_move_form_inherit" model="ir.ui.view">
-       <field name="name">account.move.form.inherit</field>
-       <field name="model">account.move</field>
-       <field name="type">form</field>
-       <field name="inherit_id" ref="account.view_move_form"/>
-       <field name="arch" type="xml">
-            <field name="to_check" position="after">
-                <field name="internal_sequence_number"/>
+        <record id="view_account_move_form_inherit" model="ir.ui.view">
+           <field name="name">account.move.form.inherit</field>
+           <field name="model">account.move</field>
+           <field name="type">form</field>
+           <field name="inherit_id" ref="account.view_move_form"/>
+           <field name="arch" type="xml">
+                <field name="to_check" position="after">
+                    <field name="internal_sequence_number"/>
+                </field>
+           </field>
+        </record>
+
+        <record id="view_account_journal_form_inherit" model="ir.ui.view">
+           <field name="name">account.journal.form.inherit</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">
+                <field name="sequence_id" position="after">
+                    <field name="internal_sequence"/>
+                </field>
+           </field>
+        </record>
+
+        <record id="view_account_move_tree_inherit" model="ir.ui.view">
+            <field name="name">account.move.tree.inherit</field>
+            <field name="model">account.move</field>
+            <field name="type">tree</field>
+            <field name="inherit_id" ref="account.view_move_tree"/>
+            <field name="arch" type="xml">
+                <field name="ref" position="before">
+                    <field name="internal_sequence_number"/>
+                </field>
             </field>
-       </field>
-    </record>
-    
-    <record id="view_account_journal_form_inherit" model="ir.ui.view">
-       <field name="name">account.journal.form.inherit</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">
-            <field name="sequence_id" position="after">
-                <field name="internal_sequence"/>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_search_inherit">
+            <field name="name">view.move.search.inherit</field>
+            <field name="model">account.move</field>
+            <field name="inherit_id" ref="account.view_account_move_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="before">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
             </field>
-       </field>
-    </record>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_line_form_inherit">
+            <field name="name">view.move.line.form.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_move_line_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="after">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_move_line_search_inherit">
+            <field name="name">view.move.line.search.inherit</field>
+            <field name="model">account.move.line</field>
+            <field name="inherit_id" ref="account.view_account_move_line_filter"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="//field[@name='ref']" position="after">
+                    <field name="internal_sequence_number"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
 
     </data>
 </openerp>

addons/account_sequence/account_sequence_data.xml

@@ -1,15 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-         <!--Account Journal Internal Sequences-->
-        
+        <!--Account Journal Internal Sequences-->
         <record id="internal_sequence_journal" model="ir.sequence">
             <field name="name">Internal Sequence Journal</field>
-            <field name="code">account.journal</field>
-            <field name="number_next">1</field>
+                <field name="code">account.journal</field>
+                <field name="number_next">1</field>
         </record>
-        
+
         <function eval="('default', False, 'internal_sequence', [('account.journal', False)], internal_sequence_journal, True, False, False, False, True)" id="internal_seq_default_set" model="ir.values" name="set"/>
-        
+
+        <!--Account Journal Internal Number of account move line-->
+
+        <record id="sp_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_sp_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="journal_col1" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="bank_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_bank_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="bank_col3_multi" model="account.journal.column">
+            <field name="view_id" ref="account.account_journal_bank_view_multi"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
+
+        <record id="sp_refund_journal_col3" model="account.journal.column">
+            <field name="view_id" ref="account.account_sp_refund_journal_view"/>
+            <field name="name">Internal Number</field>
+            <field name="field">internal_sequence_number</field>
+            <field eval="True" name="required"/>
+            <field eval="2" name="sequence"/>
+        </record>
     </data>
-</openerp>
+
+</openerp>

addons/point_of_sale/account_statement_demo.xml

@@ -13,7 +13,7 @@
             <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
         </record>
 
-        <record id="pos_cash_journal" model="account.journal">
+        <!-- <record id="pos_cash_journal" model="account.journal">
             <field name="name">Cash Journal</field>
             <field name="code">CAJ</field>
             <field name="type">cash</field>
@@ -24,6 +24,7 @@
             <field name="user_id" ref="base.user_root"/>
             <field eval="[(6,0,[ref('base.user_root')])]" name="journal_users"/>
         </record>
+        -->
 
         <record id="pos_bankcard_journal" model="account.journal">
             <field name="name">Bancontact Journal</field>

addons/point_of_sale/point_of_sale.py

@@ -752,6 +752,7 @@ class pos_order(osv.osv):
                     'period_id': period,
                     'tax_code_id': tax_code_id,
                     'tax_amount': tax_amount,
+                    'partner_id': order.partner_id and order.partner_id.id or False
                 }, context=context)
 
                 # For each remaining tax with a code, whe create a move line
@@ -817,6 +818,7 @@ class pos_order(osv.osv):
                     or 0.0,
                 'journal_id': order.sale_journal.id,
                 'period_id': period,
+                'partner_id': order.partner_id and order.partner_id.id or False
             }, context=context))
 
 

addons/point_of_sale/wizard/pos_add_product.py

@@ -79,7 +79,6 @@ class add_product(osv.osv_memory):
         this = self.browse(cr, uid, ids[0], context)
         order_obj.add_product(cr, uid, record_id, this.product_id.id, this.quantity, context=context)
 
-        obj = order_obj.browse(cr, uid, record_id, context=context)
         order_obj.write(cr, uid, [record_id], {'state': 'done'}, context=context)
         return {
             'name': _('Make Payment'),