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

[gpa(OpenERP)]

Solved the bug of the cash discount with reconcile bug/634726

=== modified file 'account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml'
--- account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	2010-06-30 05:22:29 +0000
+++ account_invoice_cash_discount/account_invoice_cash_discount_wizard.xml	2010-09-13 09:17:59 +0000
@@ -7,5 +7,12 @@
             name="populate_statement_from_inv1"
             menu="False"
             id="wizard_populate_statement_from_inv1"/>
+            
+        <wizard
+            string="Reconcile Entries"
+            model="account.move.line"
+            name="account.move.line.discount.reconcile"
+            menu="True" 
+            id="account.wizard_reconcile"/>
 	</data>
 </openerp>

=== modified file 'account_invoice_cash_discount/wizard/__init__.py'
--- account_invoice_cash_discount/wizard/__init__.py	2010-06-29 13:22:59 +0000
+++ account_invoice_cash_discount/wizard/__init__.py	2010-09-13 09:17:59 +0000
@@ -22,6 +22,7 @@
 
 import account_pay_invoice
 import invoice_statement_payment
+import wizard_discount_reconcile
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'account_invoice_cash_discount/wizard/wizard_discount_reconcile.py'
--- account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	1970-01-01 00:00:00 +0000
+++ account_invoice_cash_discount/wizard/wizard_discount_reconcile.py	2010-09-13 09:17:59 +0000
@@ -0,0 +1,179 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution	
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    $Id$
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import wizard
+import netsvc
+import time
+import osv
+import pooler
+from mx import DateTime as datetime
+from tools.translate import _
+
+_transaction_form = '''<?xml version="1.0"?>
+<form string="Reconciliation">
+    <separator string="Reconciliation transactions" colspan="4"/>
+    <field name="trans_nbr"/>
+    <newline/>
+    <field name="credit"/>
+    <field name="debit"/>
+    <separator string="Write-Off" colspan="4"/>
+    <field name="writeoff"/>
+</form>'''
+
+_transaction_fields = {
+    'trans_nbr': {'string':'# of Transaction', 'type':'integer', 'readonly':True},
+    'credit': {'string':'Credit amount', 'type':'float', 'readonly':True},
+    'debit': {'string':'Debit amount', 'type':'float', 'readonly':True},
+    'writeoff': {'string':'Write-Off amount', 'type':'float', 'readonly':True},
+}
+
+def _trans_rec_get(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+    credit = debit = 0
+    account_id = False
+    count = 0
+    for line in account_move_line_obj.browse(cr, uid, data['ids'], context=context):
+        if not line.reconcile_id and not line.reconcile_id.id:
+            count += 1
+            credit += line.credit
+            debit += line.debit
+            account_id = line.account_id.id
+    return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit}
+
+def _trans_rec_reconcile_partial(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+    account_move_line_obj.reconcile_partial(cr, uid, data['ids'], 'manual', context=context)
+    return {}
+
+def _trans_rec_reconcile(self, cr, uid, data, context=None):
+    pool = pooler.get_pool(cr.dbname)
+    account_move_line_obj = pool.get('account.move.line')
+
+    form = data['form']
+    account_id = form.get('writeoff_acc_id', False) or form.get('discount_acc_id', False)
+    context['date_p'] = form.get('date_p', False)
+    date = False
+    if context['date_p']:
+        date = datetime.strptime(context['date_p'], '%Y-%m-%d')
+    ids = pool.get('account.period').find(cr, uid, dt=date, context=context)
+    period_id = False
+    if len(ids):
+        period_id = ids[0]
+
+    journal_id = form.get('journal_id', False)
+    context['comment'] = form.get('comment', False)
+    context['analytic_id'] = form.get('analytic_id', False)
+    account_move_line_obj.reconcile(cr, uid, data['ids'], 'manual', account_id,
+            period_id, journal_id, context=context)
+    return {}
+
+def _partial_check(self, cr, uid, data, context):
+    if _trans_rec_get(self,cr,uid, data, context)['writeoff'] == 0:
+        return 'init_full'
+    return 'init_partial'
+
+_transaction_add_form = '''<?xml version="1.0"?>
+<form string="Information addendum">
+    <separator string="Write-Off Move" colspan="4"/>
+    <field name="journal_id"/>
+    <field name="writeoff_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+    <field name="date_p"/>
+    <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
+</form>'''
+
+_transaction_add_fields = {
+    'journal_id': {'string': 'Write-Off Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
+    'writeoff_acc_id': {'string':'Write-Off account', 'type':'many2one', 'relation':'account.account', 'required':True},
+    'date_p': {'string':'Date','type':'date'},
+    'comment': {'string':'Comment','type':'char', 'size': 64, 'required':True},
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
+}
+
+def _trans_rec_addendum(self, cr, uid, data, context={}):
+    date_p = time.strftime('%Y-%m-%d')
+    return {'date_p':date_p, 'comment': _('Write-Off')}
+
+_transaction_discount_form = '''<?xml version="1.0"?>
+<form string="Information Cash Discount">
+    <separator string="Cash Discount Move" colspan="4"/>
+    <field name="journal_id"/>
+    <field name="discount_acc_id" domain="[('type', '&lt;&gt;', 'view')]"/>
+    <field name="date_p"/>
+    <field name="comment"/>
+    <separator string="Analytic" colspan="4"/>
+    <field name="analytic_id"/>
+</form>'''
+
+_transaction_discount_fields = {
+    'journal_id': {'string': 'Cash Discount Journal', 'type': 'many2one', 'relation':'account.journal', 'required':True},
+    'discount_acc_id': {'string':'Cash Discount account', 'type':'many2one', 'relation':'account.account', 'required':True},
+    'date_p': {'string':'Date','type':'date'},
+    'comment': {'string':'Comment','type':'char', 'size': 64, 'required':True},
+    'analytic_id': {'string':'Analytic Account', 'type': 'many2one', 'relation':'account.analytic.account'},
+}
+
+def _trans_rec_discount(self, cr, uid, data, context={}):
+    date_p = time.strftime('%Y-%m-%d')
+    return {'date_p':date_p, 'comment': _('Cash Discount')}
+
+class wiz_reconcile(wizard.interface):
+    states = {
+        'init': {
+            'actions': [],
+            'result': {'type': 'choice', 'next_state': _partial_check}
+        },
+        'init_full': {
+            'actions': [_trans_rec_get],
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+        },
+        'init_partial': {
+            'actions': [_trans_rec_get],
+            'result': {'type': 'form', 'arch':_transaction_form, 'fields':_transaction_fields, 'state':[('end','Cancel'),('addendum','Reconcile With Write-Off'),('discount','Reconcile With Cash Discount'), ('partial','Partial Reconcile')]}
+        },
+        
+        'addendum': {
+            'actions': [_trans_rec_addendum],
+            'result': {'type': 'form', 'arch':_transaction_add_form, 'fields':_transaction_add_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+        },
+        
+        'discount': {
+            'actions': [_trans_rec_discount],
+            'result': {'type': 'form', 'arch':_transaction_discount_form, 'fields':_transaction_discount_fields, 'state':[('end','Cancel'),('reconcile','Reconcile')]}
+        },
+        'reconcile': {
+            'actions': [_trans_rec_reconcile],
+            'result': {'type': 'state', 'state':'end'}
+        },
+        'partial': {
+            'actions': [_trans_rec_reconcile_partial],
+            'result': {'type': 'state', 'state':'end'}
+        }
+    }
+wiz_reconcile('account.move.line.discount.reconcile')
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== modified file 'sales_shop_stock_availability/sales_shop_stock_availability.py'
--- sales_shop_stock_availability/sales_shop_stock_availability.py	2010-09-09 09:34:39 +0000
+++ sales_shop_stock_availability/sales_shop_stock_availability.py	2010-09-13 09:17:59 +0000
@@ -50,8 +50,8 @@
         if common_id:
             stock_common = self._product_available(cr, uid, common_id ,fields_name, context=context)
             for key,value in stock_common.items():
-                real_res[key] = stock_common[key]['qty_available']
-                virtual_res[key] = stock_common[key]['virtual_available']
+                real_res[key] = 0.0 
+                virtual_res[key] = 0.0
 
         stock2 = self._product_available(cr, uid, simple_id ,fields_name,context={})
         context.update({'shop':shop})

=== modified file 'stock_minimum_calculator/wizard/stock_order_point_calculator.py'
--- stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-09-07 13:16:30 +0000
+++ stock_minimum_calculator/wizard/stock_order_point_calculator.py	2010-09-13 09:17:59 +0000
@@ -77,7 +77,6 @@
         'string':"Method Calculation",
         'type':'selection',
         'selection':[('his_cons_with_product', 'Calculate with planning values'),
-                     ('his_cons_without_product', 'Calculate with Out historical consumptions of product'),
                      ('hist_cons_and_open_sale', 'Calculate with historical values'),
                     ],'required': True,
         'default': lambda *a:'his_cons_with_product'
@@ -85,14 +84,11 @@
 }
 
 _messages_form = '''<?xml version="1.0"?>
-<form string="Warning">
-    <label string="Information Regarding Method of Calculation" colspan="4"/>
-    <field name="message" colspan="4" nolabel="1"/>
+<form string="Message">
+    <label string="Calculations successfully done !" colspan="4"/>
 </form>'''
 
-_message_fields = {
-    'message': {'string':'Message' ,'type':'text', 'readonly':True}
-}
+_message_fields = {}
 
 def _get_default(obj, cr, uid, data, context=None):
     pool = pooler.get_pool(cr.dbname)
@@ -315,10 +311,6 @@
                     product_min_qty = int(math.ceil(average_daily_consumption *  (supplier_lead_time + purchase_lead_time) * seasonal_factor))
                     product_max_qty = max_qty_factor * product_min_qty
     
-                elif data['form']['method_qty_calculation'] == 'his_cons_without_product':
-                    product_min_qty =  int(math.ceil(plan_average_daily_consumption * (supplier_lead_time + purchase_lead_time) * seasonal_factor))
-                    product_max_qty = max_qty_factor * product_min_qty
-    
                 else:
                     try:
                         product_min_qty =  int(math.ceil((consum_qty + open_sale_qty) / pur_diff_day * (supplier_lead_time + purchase_lead_time) * seasonal_factor))
@@ -354,18 +346,6 @@
                                            
         return {}
 
-def _get_message(self, cr, uid, data, context):
-
-    if data['form']['method_qty_calculation'] == 'his_cons_with_product':
-        data['form']['message'] = _("Are your sure that you have enough historical data to calculate stock orderpoint rules with this methodology, Otherwise you should try the other options, \n Calculate without historical consumption of products or ,Calculate with historical consumption of products and sales orders")
-    elif data['form']['method_qty_calculation'] == 'his_cons_without_product':
-        data['form']['message'] = _("Your calculation is based on the field plan average daily consumption.\n Are your sure not to calculate with the method , Calculate with historical consumption of products")
-    else:
-        data['form']['message'] = _("Are your sure that you have really not enough historical data to calculate stock orderpoint rules? \n Otherwise you should prefer the options , Calculate with historical consumption of products. This results may calculate better results than calculation with this methodology.")
-    return data['form']
-
-
-
 class orderpoint_calculator(wizard.interface):
     states = {
         'init' : {
@@ -382,7 +362,7 @@
             },
 
       'end2': {
-            'actions': [ _get_message ],
+            'actions': [],
             'result': {'type': 'form', 'arch': _messages_form,
                 'fields': _message_fields,
                 'state': (