openerp-dev-web team mailing list archive

["Rucha \(Open ERP\)" <rpa@xxxxxxxxxxx>]

Rucha (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-fixes-ind-addons2 into lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

Requested reviews:
  Husen Daudi (husendaudi)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fixes-ind-addons2/+merge/58437
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-fixes-ind-addons2/+merge/58437
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bugfixes-Ind.

=== modified file 'mrp/mrp_view.xml'
--- mrp/mrp_view.xml	2011-03-11 15:18:19 +0000
+++ mrp/mrp_view.xml	2011-04-20 06:03:31 +0000
@@ -638,7 +638,7 @@
                         <field name="date_planned"/>
                         <field name="origin"/>
                         <newline/>
-                        <field name="product_id" on_change="product_id_change(product_id)"/>
+                        <field name="product_id" on_change="product_id_change(product_id)" domain="[('type','=','product')]"/>
                         <field name="product_qty"/>
                         <field name="product_uom"/>
                         <button type="action"

=== modified file 'procurement/procurement.py'
--- procurement/procurement.py	2011-01-17 08:00:48 +0000
+++ procurement/procurement.py	2011-04-20 06:03:31 +0000
@@ -512,13 +512,13 @@
         'product_id': fields.many2one('product.product', 'Product', required=True, ondelete='cascade', domain=[('type','=','product')]),
         'product_uom': fields.many2one('product.uom', 'Product UOM', required=True),
         'product_min_qty': fields.float('Min Quantity', required=True,
-            help="When the virtual stock goes belong the Min Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Min Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'product_max_qty': fields.float('Max Quantity', required=True,
-            help="When the virtual stock goes belong the Max Quantity, OpenERP generates "\
+            help="When the virtual stock goes below the Max Quantity, OpenERP generates "\
             "a procurement to bring the virtual stock to the Max Quantity."),
         'qty_multiple': fields.integer('Qty Multiple', required=True,
-            help="The procurement quantity will by rounded up to this multiple."),
+            help="The procurement quantity will be rounded up to this multiple."),
         'procurement_id': fields.many2one('procurement.order', 'Latest procurement', ondelete="set null"),
         'company_id': fields.many2one('res.company','Company',required=True),
         'procurement_draft_ids': fields.function(_get_draft_procurements, method=True, type='many2many', relation="procurement.order", \

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-03-14 10:27:42 +0000
+++ purchase/purchase.py	2011-04-20 06:03:31 +0000
@@ -98,7 +98,7 @@
             tot = 0.0
             for invoice in purchase.invoice_ids:
                 if invoice.state not in ('draft','cancel'):
-                    tot += invoice.amount_untaxed
+                    tot += (invoice.amount_untaxed - invoice.residual)
             if purchase.amount_untaxed:
                 res[purchase.id] = tot * 100.0 / purchase.amount_untaxed
             else:

=== modified file 'resource/resource_view.xml'
--- resource/resource_view.xml	2011-01-14 00:11:01 +0000
+++ resource/resource_view.xml	2011-04-20 06:03:31 +0000
@@ -225,7 +225,7 @@
                        </group>
                        <group colspan="2" col="2">
                            <field name="date_from"/>
-                           <field name="calendar_id" string="Working Period" readonly='1'/>
+                           <field name="calendar_id" string="Working Period"/>
                            <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                        </group>
                        <group colspan="2" col="2">