[MERGE]:merged with trunk.

bzr revid: apa@tinyerp.com-20120803051416-omqxsq5dp0meccmu

addons/crm/res_partner.py

@@ -46,6 +46,14 @@ class res_partner(osv.osv):
         'meeting_count': fields.function(_opportunity_meeting_count, string="Meeting", type='integer', multi='opp_meet'),
     }
 
+    def copy(self, cr, uid, record_id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default.update({'opportunity_ids': [], 'meeting_ids' : [], 'phonecall_ids' : []})
+
+        super(res_partner, self).copy(cr, uid, record_id, default, context)
+
     def redirect_partner_form(self, cr, uid, partner_id, context=None):
         search_view = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'base', 'view_res_partner_filter')
         value = {

addons/sale/res_partner.py

@@ -31,6 +31,14 @@ class res_partner(osv.osv):
             res[partner.id] = len(partner.sale_order_ids)
         return res
 
+    def copy(self, cr, uid, record_id, default=None, context=None):
+        if default is None:
+            default = {}
+
+        default.update({'sale_order_ids': []})
+
+        super(res_partner, self).copy(cr, uid, record_id, default, context)
+
     _columns = {
         'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'),
         'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order')

addons/sale/sale_view.xml

@@ -164,7 +164,7 @@
                             <button name="action_button_confirm" states="sent" string="Confirm" class="oe_highlight" type="object"/>
                             <button name="action_view_invoice" string="Open Invoice" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|',('state', '!=','progress'), ('invoiced', '=', True),('order_policy','=','picking')]}"/>
-                            <button name="action_view_delivery" string="Open Delivery Order" type="object" class="oe_highlight"
+                            <button name="action_view_delivery" string="View Delivery Order" type="object" class="oe_highlight"
                               attrs="{'invisible': ['|','|','|',('picking_ids','=',False),('picking_ids','=',[]), ('state', 'not in', ('progress','manual')),('shipped','=',True)]}"/>
                             <button name="%(action_view_sale_advance_payment_inv)d" string="Create Invoice"
                                 type="action" states="manual" class="oe_highlight"/>
@@ -287,14 +287,18 @@
                             <group class="oe_subtotal_footer oe_right" colspan="2" name="sale_total">
                                 <field name="amount_untaxed"/>
                                 <field name="amount_tax"/>
-                                <field name="amount_total" class="oe_subtotal_footer_separator"/>
+                                <div class="oe_subtotal_footer_separator oe_inline">
+                                    <label for="amount_total" />
+                                    <button name="button_dummy"
+                                        states="draft" string="(update)" type="object" class="oe_edit_only oe_link"/>
+                                </div>
+                                <field name="amount_total" nolabel="1" class="oe_subtotal_footer_separator"/>
                             </group>
                             <group name="sale_margin_grp">
                             </group>
-                            <div class="oe_clear">
-                                <label for="note"/>
-                            </div>
-                            <field name="note" class="oe_inline"/>
+                            <div class="oe_clear"/>
+                            <label for="note"/>
+                            <field name="note"/>
                         </page>
                         <page string="Other Information" groups="base.group_user">
                             <group>
@@ -364,6 +368,7 @@
                     <filter icon="terp-document-new" string="Quotations" name="draft" domain="[('state','in',('draft','sent'))]" help="Sales Order that haven't yet been confirmed"/>
                     <filter icon="terp-check" string="Sales" name="sales" domain="[('state','in',('manual','progress'))]"/>
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
+                    <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
                     <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>

addons/sale/wizard/sale_make_invoice_advance.py

@@ -28,7 +28,7 @@ class sale_advance_payment_inv(osv.osv_memory):
 
     _columns = {
         'advance_payment_method':fields.selection(
-            [('all', 'All'), ('percentage','Percentage'), ('fixed','Fixed Price'),
+            [('all', 'Invoice all the Sale Order'), ('percentage','Percentage'), ('fixed','Fixed Price'),
                 ('lines', 'Some Order Lines')],
             'Type', required=True,
             help="""Use All to create the final invoice.