Merge

bzr revid: vra@tinyerp.com-20090618041403-qysntpo0sk6sgeji

addons/point_of_sale/report/pos_receipt.py

@@ -22,6 +22,7 @@
 
 import time
 from report import report_sxw
+from mx.DateTime.ISO import ParseAny
 import pooler
 
 
@@ -35,11 +36,17 @@ class order(report_sxw.rml_parse):
 
         self.localcontext.update({
             'time': time,
+            'dformat': '%Y/%m/%d %H:%M:%S',
             'disc': self.discount,
             'net': self.netamount,
+            'formatdate': self.formatdate,
             'address': partner.address and partner.address[0] or False,
         })
 
+    def formatdate(self, datestr):
+        dateobj = ParseAny(datestr)
+        return dateobj.strftime(self.localcontext['dformat'])
+
     def netamount(self, order_line_id):
         sql = 'select (qty*price_unit) as net_price from pos_order_line where id = %s'
         self.cr.execute(sql, (order_line_id,))

addons/point_of_sale/report/pos_receipt.rml

@@ -83,8 +83,8 @@
     <para style="terp_default_Centre_9">Tel : [[ address and address.phone ]]</para>
     <para style="terp_default_Centre_9">E-mail : [[ address and address.email ]]</para>
     <para style="terp_default_Centre_9">Salesman : [[ o.salesman_id.name ]]</para>
-    <para style="terp_default_Centre_9">Sale Date : [[ o.date_order ]]</para>
-    <para style="terp_default_Centre_9">Receipt Printing Date : [[ time.strftime('%d/%m/%Y %H:%M') ]]</para>
+    <para style="terp_default_Centre_9">Sale Date : [[ formatdate(o.date_order) ]]</para>
+    <para style="terp_default_Centre_9">Receipt Printing Date : [[ time.strftime(dformat) ]]</para>
     <para style="terp_default_Centre_9">
       <font color="white"> </font>
     </para>

addons/report_task/i18n/de_DE.po

@@ -161,4 +161,12 @@ msgstr "Fehlerhafter xml Code für diese Ansicht!"
 
 #. module: report_task
 #: field:report.closed.task,delay_hours:0
-ms
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: repo

addons/report_task/i18n/fr_FR.po

@@ -160,4 +160,13 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: report_task
-#: field:report.closed.task,delay_hours
+#: field:report.closed.task,delay_hours:0
+msgid "Delay Hours"
+msgstr ""
+
+#. module: report_task
+#: field:report.closed.task,project_id:0
+msgid "Project"
+msgstr ""
+
+#. module: repo

addons/scrum/scrum_view.xml

@@ -316,7 +316,7 @@
             <field name="name">View sprint Tasks</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">[('product_backlog_id', '=', 'S('+str(active_id)+')')]</field>
+            <field name="domain">[('product_backlog_id', '=', active_id)]</field>
         </record>
         <record id="ir_scrum_sprint_open_task" model="ir.values">
             <field eval=" 'tree_but_open'" name="key2"/>

addons/scrum/wizard/backlog_to_task.py

@@ -46,7 +46,8 @@ def _do_create(self, cr, uid, data, context):
             'description': backlog.note,
             'project_id': backlog.project_id.id,
             'user_id': (backlog.user_id and backlog.user_id.id) or uid,
-            'priority': backlog.priority
+            'priority': backlog.priority,
+            'planned_hours': backlog.planned_hours
         }))
 
     value = {

addons/stock/stock.py

@@ -1405,12 +1405,16 @@ class stock_picking_move_wizard(osv.osv_memory):
         for act in self.read(cr,uid,ids):
             move_lines=move_obj.browse(cr,uid,act['move_ids'])
             for line in move_lines:
-                 picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
-                 picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
-                 cr.commit()
-                 old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
-                 if not len(old_picking['move_lines']):
-                    picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
+                if line.picking_id:
+                    picking_obj.write(cr,uid,[line.picking_id.id],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
+                    picking_obj.write(cr,uid,[act['picking_id']],{'move_lines':[(1,line.id,{'picking_id':act['picking_id']})]})
+                    cr.commit()
+                    old_picking=picking_obj.read(cr,uid,[line.picking_id.id])[0]
+                    if not len(old_picking['move_lines']):
+                        picking_obj.write(cr,uid,[old_picking['id']],{'state':'done'})
+                else:
+                    raise osv.except_osv(_('UserError'),
+                        _('You can not create new moves.'))
         return {'type':'ir.actions.act_window_close' }
 
 stock_picking_move_wizard()