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

[gpa(OpenERP)]

added auto field in the stock.warehouse.orderpoint object

=== modified file 'account_payment_discount_extension/account_payment_discount.py'
--- account_payment_discount_extension/account_payment_discount.py	2010-08-26 10:59:54 +0000
+++ account_payment_discount_extension/account_payment_discount.py	2010-09-06 09:55:54 +0000
@@ -31,6 +31,13 @@
     _inherit='payment.order'
     _columns={
         'inter_bank_journal': fields.many2one('account.journal', 'Intermediate Bank Journal', required=False),
+        'exp_next_payment_date': fields.date('Expected Next Payment',),
+        'date_prefered': fields.selection([
+            ('now', 'Directly'),
+            ('due', 'Due date'),
+            ('discount_due', 'Cash Discount and Due Date'),
+            ('fixed', 'Fixed date')
+            ], "Preferred date", change_default=True, required=True, states={'done':[('readonly',True)]}, help="Choose an option for the Payment Order:'Fixed' stands for a date specified by you.'Directly' stands for the direct execution.'Due date' stands for the scheduled date of execution."),
     }
 payment_order()
 
 
=== modified file 'account_payment_discount_extension/account_payment_discount_view.xml'
--- account_payment_discount_extension/account_payment_discount_view.xml	2010-08-26 10:59:54 +0000
+++ account_payment_discount_extension/account_payment_discount_view.xml	2010-09-06 09:55:54 +0000
@@ -34,6 +34,8 @@
             <field name="inherit_id" ref="account_payment_extension.view_payment_order_form_ext1"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@string='Select invoices to pay/receive payment']" position="replace">
+                        <label string=""/>
+                        <field name="exp_next_payment_date" attrs="{'required': [('date_prefered','=','discount_due')]}" />
                         <button name="%(wizard_populate_payment_discount_ext)d"  string="Select invoices to pay/receive payment" type="action" attrs="{'invisible':[('state','=','done')]}"/>
                 </xpath>
             </field>
@@ -49,6 +51,7 @@
                     <field name="cash_discount" />
                     <field name="discount_date" />
                     <field name="pay_amount" />
+                    <label stirng=""/>
                 </xpath>
             </field>
         </record>
@@ -63,7 +66,6 @@
                     <field name="cash_discount" />
                     <field name="discount_date" />
                     <field name="pay_amount" />
-                    <label stirng=""/>
                 </xpath>
             </field>
         </record>
@@ -80,6 +82,18 @@
             </field>
         </record>
         
+        <record model="ir.ui.view" id="view_payment_order_bank_form2">
+            <field name="name">payment.order.form1</field>
+            <field name="model">payment.order</field>
+            <field name="inherit_id" ref="account_payment.view_payment_order_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="date_prefered" position="replace">
+                    <field name="date_prefered"/>
+                </field>
+            </field>
+        </record>
+        
         <record id="view_payment_order_wizard_form" model="ir.ui.view">
             <field name="name">payment.order.form1</field>
             <field name="model">payment.order</field>
 
=== modified file 'account_payment_discount_extension/wizard/wizard_payment_discount_order.py'
--- account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-08-26 10:59:54 +0000
+++ account_payment_discount_extension/wizard/wizard_payment_discount_order.py	2010-09-06 09:55:54 +0000
@@ -51,8 +51,10 @@
     order_obj = pool.get('payment.order')
     line_obj = pool.get('account.move.line')
     invoice_obj = pool.get('account.invoice')
-    payment = order_obj.browse(cr, uid, data['id'],
-            context=context)
+    payment_term_obj = pool.get('account.payment.term')
+    
+    payment = order_obj.browse(cr, uid, data['id'], context=context)
+    
     ctx = ''
     if payment.mode:
         ctx = '''context="{'journal_id': %d}"''' % payment.mode.journal.id
@@ -68,9 +70,22 @@
     for line in line_obj.browse(cr, uid, sel_line_ids, context):
         if line.invoice.id:
             invoice_data = invoice_obj.browse(cr, uid, line.invoice.id, context=context)
-            if invoice_data.next_payment_date:
-                if invoice_data.next_payment_date >=search_due_date:
-                    line_ids.append(line.id)
+            discount_data = payment_term_obj.browse(cr, uid, invoice_data.payment_term.id).cash_discount_ids
+             
+            if payment.date_prefered == 'fixed':
+                if invoice_data.next_payment_date:
+                    if invoice_data.next_payment_date >=search_due_date:
+                        line_ids.append(line.id)
+                        
+            elif payment.date_prefered == 'discount_due':
+                from_date = time.mktime(time.strptime(invoice_data.next_payment_date,'%Y-%m-%d'))
+                to_date = time.mktime(time.strptime(invoice_data.date_invoice,'%Y-%m-%d'))
+                diff_day = (from_date-to_date)/(3600*24)
+                if discount_data:
+                    cash_delay = discount_data[0].delay
+                    if invoice_data.date_due <= payment.exp_next_payment_date and diff_day == cash_delay:
+                            line_ids.append(line.id)        
+        
     
     FORM.string = '''<?xml version="1.0" encoding="utf-8"?>
 <form string="Populate Payment:">
@@ -140,6 +155,8 @@
             date_to_pay = line.date_maturity
         elif payment.date_prefered == 'fixed':
             date_to_pay = payment.date_planned
+        elif payment.date_prefered == 'discount_due':    
+            date_to_pay = payment.exp_next_payment_date
             
         order_line_obj.create(cr,uid,{
             'move_line_id': line.id,
@@ -162,8 +179,10 @@
 def _get_defaults(self, cr, uid, data, context):
     pool= pooler.get_pool(cr.dbname)
     order_obj = pool.get('payment.order')
-    plan_date = order_obj.browse(cr, uid, data['id'], context=context).date_planned
-    data['form']['duedate'] = plan_date
+    order_data = order_obj.browse(cr, uid, data['id'], context=context)
+    plan_date = order_data.date_planned
+    if order_data.date_prefered == 'fixed':
+        data['form']['duedate'] = plan_date
     return data['form']
 
 class wizard_payment_order(wizard.interface):
 
=== modified file 'stock_minimum_calculator/stock_minimum_calculator.py'
--- stock_minimum_calculator/stock_minimum_calculator.py	2010-07-22 16:32:31 +0000
+++ stock_minimum_calculator/stock_minimum_calculator.py	2010-09-06 09:55:54 +0000
@@ -63,4 +63,15 @@
     }
 product_product()
 
+class stock_warehouse_orderpoint(osv.osv):
+    _inherit = "stock.warehouse.orderpoint"
+    _columns = {
+       'auto': fields.boolean('Auto'),
+    }
+    _defaults = {
+        'auto': lambda *a: True,
+        }
+    
+stock_warehouse_orderpoint()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
=== modified file 'stock_minimum_calculator/stock_minimum_calculator_view.xml'
--- stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-07-22 16:39:01 +0000
+++ stock_minimum_calculator/stock_minimum_calculator_view.xml	2010-09-06 09:55:54 +0000
@@ -100,7 +100,19 @@
                     <field name="plan_avg_consume" />
                 </field>
             </field>
-        </record>		
+        </record>
+        
+        <record model="ir.ui.view" id="view_warehouse_orderpoint_inherit_form">
+            <field name="name">stock.warehouse.orderpoint.form</field>
+            <field name="model">stock.warehouse.orderpoint</field>
+            <field name="inherit_id" ref="mrp.view_warehouse_orderpoint_form"/>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <field name="procurement_id" position="after">
+                    <field name="auto"/>
+                </field>
+            </field>
+        </record>
 
     </data>
 </openerp>
 
=== modified file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-08-18 11:07:12 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-09-06 09:55:54 +0000
@@ -331,7 +331,7 @@
                     for stock_rule_id in stock_rule_ids:
                         min_rule_obj.unlink(cr, uid, [stock_rule_id],context=context)
     
-                mini_stock_rule_id = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id']),('product_id','=',filter_product_id)])
+                mini_stock_rule_id = min_rule_obj.search(cr,uid,[('warehouse_id','=',data['form']['warehouse_id']),('product_id','=',filter_product_id),('auto','=',True)])
 
                 if mini_stock_rule_id:
                     for stock_rule_id in mini_stock_rule_id: