Merge lp:~openbig/bigconsulting/improvement_cash_discount into lp:bigconsulting

[gpa(OpenERP)]

Added changes as improvement by client

[Husen Daudi (husendaudi)]

remove print statement and improve code to remove self.pool.get and make object at the starting of method.

review: Needs Fixing

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount.py'
--- account_invoice_cash_discount/account_invoice_cash_discount.py	2010-06-29 13:22:59 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount.py	2010-07-01 12:23:23 +0000
@@ -221,6 +221,7 @@
             move_line = context['tax_move_ids']
             for move_line_id in move_line:
                 move_line_data = self.pool.get('account.move.line').browse(cr, uid,move_line_id)
+                print "move_line_data::::::",move_line_data
                 l3 = {
                         'debit': move_line_data.debit,
                         'credit': move_line_data.credit,
@@ -235,6 +236,8 @@
                         'tax_amount':move_line_data.tax_amount,
                         }
                 lines.append((0, 0, l3))
+                self.pool.get('account.move.line').unlink(cr, uid,[move_line_id])
+                self.pool.get('account.move').unlink(cr, uid,[move_line_data.move_id.id])
         else:
             if amount_discount>0.0:         
                 for line in invoice.invoice_line:
@@ -278,6 +281,7 @@
                         }
             lines.append((0, 0, l4))
             
+            self.pool.get('account.move').unlink(cr, uid, context['discount_move_ids'])
         else:
             if amount_discount>0:
                 if 'account_id' in context and context['account_id']:
@@ -324,5 +328,24 @@
     
 account_invoice()
 
+class account_move_line(osv.osv):
+    _name = 'account.move.line'
+    _inherit = 'account.move.line'
+    
+    def _invoice(self, cr, uid, ids, name, arg, context=None):
+        res = {}
+        if ids:
+            return super(account_move_line, self)._invoice(cr, uid, ids, name, arg, context)
+        else:
+            return res
+        
+    def _invoice_search(self, cr, uid, obj, name, args, context={}):
+        return super(account_move_line, self)._invoice_search(cr, uid, obj, name, args, context=context)
+        
+    _columns = {
+       'invoice': fields.function(_invoice, method=True, string='Invoice',
+          type='many2one', relation='account.invoice', fnct_search=_invoice_search),
+    }
+account_move_line()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice.py'
--- account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-06-29 13:22:59 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice.py	2010-07-01 12:23:23 +0000
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 import time
-
+from lxml import etree
 from osv import fields, osv
 from tools.translate import _
 #import decimal_precision as dp
@@ -62,7 +62,7 @@
         'journal_id': fields.many2one('account.journal', 'Journal/Payment Mode', required=True),
         'period_id': fields.many2one('account.period', 'Period', required=True),
         'cash_amount':fields.float('Cash Discount Amount',),
-        'account_id': fields.many2one('account.account', 'Account For Discount',),
+        'account_id': fields.many2one('account.account', 'Customers Cash Discount Account',),
         'cal_method_selection': fields.selection([('method_gross_methodology','Calculate Discount with Net Gross Methodology'),
                                             ('method_net_methodology','Calculate Discount with Net Methodology'),],
                                               'Method To Calculation'),
@@ -135,7 +135,7 @@
         invoice = self.pool.get('account.invoice').browse(cr, uid, context['id'], context=context)
         tax_obj = self.pool.get('account.tax')
         invoice_tax_obj = self.pool.get("account.invoice.tax")
-
+        
         ######## to get ref
         if invoice.type in ('in_invoice', 'in_refund'):
             ref = invoice.reference
@@ -155,7 +155,7 @@
         ### Entry for taxes in the line of wizard tax
         if data.get('cash_amount',0.0)>0.0:
             lines3 = []
-            tax_total_amount = 0.0    
+            tax_total_amount = 0.0
             line_ids = []     
             for line in invoice.invoice_line:
                 if line.invoice_line_tax_id:
@@ -166,6 +166,7 @@
                         for tax_id in tax_invoice_id:
                             tax_value = invoice_tax_obj.browse(cr, uid, tax_id)
                             tax_account_id = tax_value.account_id.id
+               
                         l3 = {
                             'debit': direction * tax_amount<0 and - direction * tax_amount,
                             'credit': direction * tax_amount>0 and  direction * tax_amount,
@@ -182,16 +183,29 @@
                         line_id = self.pool.get('account.move.line').create(cr,uid,l3,context=context)
                         line_ids.append(line_id)
             self.write(cr, uid, ids, {'tax_move_ids':[(6,0,line_ids)]}, context)
-
+            
             ### Entry for discount in the line of wizard discount
             lines4 = []
             if tax_total_amount>0:
                 data['cash_amount'] = (data['cash_amount'] - tax_total_amount)
-                    
+            
+            ############################  if method type net methology than discount account journal account 
+            discount_account_id = False
+            
+            if data['cal_method_selection'] == 'method_net_methodology':
+                journal_id = data['journal_id']
+                if context['type'] == 'out_invoice':
+                    discount_account_id = self.pool.get('account.journal').browse(cr, uid, journal_id).default_debit_account_id.id
+                else:
+                    discount_account_id = self.pool.get('account.journal').browse(cr, uid, journal_id).default_credit_account_id.id
+            else:
+                 discount_account_id = data['account_id']
+            ###############################################3
+                
             l4 = {
                 'debit': direction * data.get('cash_amount',0.0)<0 and - direction * data.get('cash_amount',0.0),
                 'credit': direction * data.get('cash_amount',0.0)>0 and  direction * data.get('cash_amount',0.0),
-                'account_id': data['account_id'],
+                'account_id': discount_account_id,
                 'partner_id': invoice.partner_id.id,
                 'ref':ref,
                 'date': date,
@@ -326,7 +340,20 @@
                 amount, acc_id, data['period_id'], data['journal_id'], writeoff_account_id,
                 data['period_id'], writeoff_journal_id, context, data['name'])
         return {}
-
+    
+    def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False):
+        res = super(account_invoice_pay,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar)
+        fields=res.get('fields',{})
+        word = "Supplier Cash Discount Account"
+        type = context.get('type',False)
+        eview = etree.fromstring(res['arch'])
+        res['arch'] = etree.tostring(eview)
+        if type == 'in_invoice':
+            for f in res['fields']:
+                if 'Customers Cash Discount Account' in res['fields'][f]['string']:
+                    res['fields'][f]['string'] = res['fields'][f]['string'].replace('Customers Cash Discount Account',word)
+        return res
+        
 account_invoice_pay()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'account_invoice_cash_discount/wizard/account_pay_invoice_view.xml'
--- account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-06-29 13:22:59 +0000
+++ account_invoice_cash_discount/wizard/account_pay_invoice_view.xml	2010-07-01 12:23:23 +0000
@@ -70,7 +70,5 @@
                </form>
             </field>
         </record>
-
-
 	</data>
 </openerp>
\ No newline at end of file

=== modified file 'packing_barcode_check/wizard/scan_product.py'
--- packing_barcode_check/wizard/scan_product.py	2010-06-29 06:24:04 +0000
+++ packing_barcode_check/wizard/scan_product.py	2010-07-01 12:23:23 +0000
@@ -51,8 +51,14 @@
             product_ean = ean_data.ean
             if product_ean == form_ean:
                 EAN_Found = True
-                return 'scan_product_number'
-    if not EAN_Found:
+                
+            if EAN_Found:
+                if move_data.product_id.track_production:
+                    return 'scan_product_number'
+                else:
+                    stock_move_obj.write(cr, uid, [move_id],{'scaned_qty':move_data.scaned_qty+1}, context=context)
+                    return 'init'
+    else:
         raise osv.except_osv(_('Warning!'),('Product does not belongs to this picking or already scanned.'))
     return {}