[MERGE] merge with dev-addons3

bzr revid: psi@tinyerp.co.in-20110204132444-3upwmphirbzhc0uy

addons/account/account.py

@@ -2455,8 +2455,8 @@ class account_chart_template(osv.osv):
         'property_account_expense': fields.many2one('account.account.template','Expense Account on Product Template'),
         'property_account_income': fields.many2one('account.account.template','Income Account on Product Template'),
         'property_reserve_and_surplus_account': fields.many2one('account.account.template', 'Reserve and Profit/Loss Account', domain=[('type', '=', 'payable')], help='This Account is used for transferring Profit/Loss(If It is Profit: Amount will be added, Loss: Amount will be deducted.), Which is calculated from Profilt & Loss Report'),
-        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account', help='This Account is used for income opening entries'),
-        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account', help='This Account is used for expense opening entires'),
+        'property_account_income_opening': fields.many2one('account.account.template','Opening Entries Income Account'),
+        'property_account_expense_opening': fields.many2one('account.account.template','Opening Entries Expense Account'),
     }
 
 account_chart_template()
@@ -2920,7 +2920,6 @@ class wizard_multi_charts_accounts(osv.osv_memory):
             'view_id': view_id,
             'name': _('Miscellaneous Journal'),
             'type': 'general',
-            'refund_journal': True,
             'code': _('MISC'),
             'sequence_id': seq_id_miscellaneous,
             'analytic_journal_id': analitical_journal_miscellaneous,

addons/account/installer.py

@@ -547,7 +547,7 @@ class account_installer(osv.osv_memory):
         # Opening Entries Journal
         if obj_multi.property_account_income_opening and obj_multi.property_account_expense_opening:
             vals_journal = {
-                'view_id': view_id,
+                'view_id': view_id_misc,
                 'name': _('Opening Entries Journal'),
                 'type': 'situation',
                 'code': _('OPEJ'),

addons/point_of_sale/i18n/point_of_sale.pot

@@ -1428,6 +1428,11 @@ msgstr ""
 msgid "Person who uses the the cash register. It could be a reliever, a student or an interim employee."
 msgstr ""
 
+#. module: point_of_sale
+#: help:pos.order.line, prodlot_id:0
+msgid "You can specify Production lot for stock move created when you validate the pos order"
+msgstr ""
+
 #. module: point_of_sale
 #: field:report.transaction.pos,invoice_id:0
 msgid "Nbr Invoice"

addons/point_of_sale/point_of_sale.py

@@ -423,7 +423,7 @@ class pos_order(osv.osv):
         """Create a picking for each order and validate it."""
         picking_obj = self.pool.get('stock.picking')
         property_obj = self.pool.get("ir.property")
-        move_obj=self.pool.get('stock.move')
+        move_obj = self.pool.get('stock.move')
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         orders = self.browse(cr, uid, ids, context=context)
         for order in orders:
@@ -464,7 +464,6 @@ class pos_order(osv.osv):
                     stock_dest_id = val.id
                     if line.qty < 0:
                         location_id, stock_dest_id = stock_dest_id, location_id
-
                     move_obj.create(cr, uid, {
                             'name': '(POS %d)' % (order.id, ),
                             'product_uom': line.product_id.uom_id.id,
@@ -478,6 +477,7 @@ class pos_order(osv.osv):
                             'state': 'waiting',
                             'location_id': location_id,
                             'location_dest_id': stock_dest_id,
+                            'prodlot_id': line.prodlot_id and line.prodlot_id.id or False
                         }, context=context)
 
             wf_service = netsvc.LocalService("workflow")
@@ -1147,6 +1147,7 @@ class pos_order_line(osv.osv):
         'discount': fields.float('Discount (%)', digits=(16, 2)),
         'order_id': fields.many2one('pos.order', 'Order Ref', ondelete='cascade'),
         'create_date': fields.datetime('Creation Date', readonly=True),
+        'prodlot_id': fields.many2one('stock.production.lot', 'Production Lot', help="You can specify Production lot for stock move created when you validate the pos order"),
     }
 
     _defaults = {

addons/point_of_sale/point_of_sale_view.xml

@@ -41,6 +41,7 @@
                                     <field name="price_unit"/>
                                     <field name="notice"/>
                                     <field name="serial_number"/>
+                                    <field name="prodlot_id" domain="[('product_id','=',product_id)]"/>
                                 </form>
                             </field>
                             <group colspan="4" col="7">