openerp-dev-web team mailing list archive

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

pso (Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #438717 Error in account_anglo_saxon when using foreign currency
  https://bugs.launchpad.net/bugs/438717
  #539539 product - VAT definition - multicompany
  https://bugs.launchpad.net/bugs/539539
  #589256 Wrong tax calculation in point of sale (POS)
  https://bugs.launchpad.net/bugs/589256
  #617974 trunk - hr payment - rounding issue payment slip
  https://bugs.launchpad.net/bugs/617974
  #646350 [trunk] sale analysis - wrong average price
  https://bugs.launchpad.net/bugs/646350
  #663585 [6.0rc1] suggested improvements to PO and SO form view
  https://bugs.launchpad.net/bugs/663585
  #663967 [RC1] SO -History - can delete related invoice
  https://bugs.launchpad.net/bugs/663967
  #666592 save and close crash adding product in point of sale
  https://bugs.launchpad.net/bugs/666592
  #669360 hr_timeeshet_sheet : installation fails on 1st (and probably last) date of the month.
  https://bugs.launchpad.net/bugs/669360
  #669533 [hr_timesheet] Employee timesheet reports confuse employee id and user id
  https://bugs.launchpad.net/bugs/669533
  #672684 Manual Global Tax
  https://bugs.launchpad.net/bugs/672684
  #673835 Sales, Purchase and Invoice Analysis Problem
  https://bugs.launchpad.net/bugs/673835
  #689924 [sale_margin] purchase price is wrong
  https://bugs.launchpad.net/bugs/689924
  #691810 Cannot cancel invoice BUG
  https://bugs.launchpad.net/bugs/691810
  #692456 Sale Order Reference not unique
  https://bugs.launchpad.net/bugs/692456
  #692735 [6.0] sales - canceled SO should not be black (normal)
  https://bugs.launchpad.net/bugs/692735
  #692964 in hr_recruitment, add a column "Subject" in applicants list view
  https://bugs.launchpad.net/bugs/692964
  #692976 expenses list shouldn't be editable
  https://bugs.launchpad.net/bugs/692976
  #693788 payroll compute sheet error
  https://bugs.launchpad.net/bugs/693788
  #694107 Point of Sale Journals credits customer debtor account instead of product's income accounts (v6rc1)
  https://bugs.launchpad.net/bugs/694107
  #694876 [6.0] dashboard finance - company analysis - P&L accounts seems to use data of all periods/fy
  https://bugs.launchpad.net/bugs/694876
  #697672 Wrong label for interview request state
  https://bugs.launchpad.net/bugs/697672
  #697691 Missing "Analytic Account" column in view "Timesheet by Account"
  https://bugs.launchpad.net/bugs/697691

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/45329

Hello,

Fixed https://bugs.launchpad.net/openobject-addons/+bug/697691
      https://bugs.launchpad.net/openobject-addons/+bug/697672

Improved point_of_sale demo.

Thanks,
pso (Open ERP)
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/pso-dev-addons3/+merge/45329
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/pso-dev-addons3 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet_view.xml'
--- hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-01-04 13:28:53 +0000
+++ hr_timesheet_sheet/hr_timesheet_sheet_view.xml	2011-01-06 06:50:17 +0000
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+    
        <record id="hr_timesheet_sheet_graph" model="ir.ui.view">
          <field name="name">hr.timesheet.sheet.graph</field>
          <field name="model">hr_timesheet_sheet.sheet</field>
@@ -26,7 +27,20 @@
                 </form>
             </field>
         </record>
-
+        <record id="hr_timesheet_account_filter" model="ir.ui.view">
+            <field name="name">hr.timesheet.account.filter</field>
+            <field name="model">hr_timesheet_sheet.sheet.account</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Account">
+                    <group col="10" colspan="4">
+                        <field name="sheet_id" />
+                        <field name="name" groups="analytic.group_analytic_accounting"/>
+                        <field name="invoice_rate"/>
+                    </group>
+                </search>
+            </field>
+        </record>
         <record id="hr_timesheet_account_tree" model="ir.ui.view">
             <field name="name">hr.timesheet.account.tree</field>
             <field name="model">hr_timesheet_sheet.sheet.account</field>

=== modified file 'point_of_sale/point_of_sale_demo.xml'
--- point_of_sale/point_of_sale_demo.xml	2011-01-05 12:50:35 +0000
+++ point_of_sale/point_of_sale_demo.xml	2011-01-06 06:50:17 +0000
@@ -26,7 +26,7 @@
 			<field eval="0" name="reconciled"/>
 			<field eval="450.0" name="residual"/>
 			<field name="move_name">/</field>
-			<field name="date_invoice">time.strftime('%Y-%m-%d')</field>
+			<field name="date_invoice" eval="time.strftime('%Y-%m-%d')"/>
 			<field name="period_id" ref="account.period_10"/>
 			<field eval="450.0" name="amount_untaxed"/>
 			<field model="account.move" name="move_id" search="[('name', '=', u'SAJ/2010/010')]"/>
@@ -53,7 +53,7 @@
 			<field name="date_validity">2011-04-07</field>
 			<field name="shop_id" ref="sale.shop"/>
 			<field name="user_salesman_id" ref="base.user_root"/>
-			<field name="date_order">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="date_order" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 			<field name="partner_id" ref="base.res_partner_agrolait"/>
 			<field eval="1" name="nb_print"/>
 			<field name="user_id" ref="base.user_root"/>
@@ -62,7 +62,7 @@
 			<field name="state">paid</field>
 			<field name="sale_manager" ref="base.user_root"/>
 			<field name="pricelist_id" ref="product.list0"/>
-			<field name="date_validation">time.strftime('%Y-%m-%d')</field>
+			<field name="date_validation" eval="time.strftime('%Y-%m-%d')"/>
 			<field name="name">POS/019</field>
 			<field name="price_type">tax_excluded</field>
 			<field model="account.invoice" name="invoice_id" search="[('name', '=', u'Invoice from POS: POS/019')]"/>
@@ -76,7 +76,7 @@
 			<field name="journal_id" ref="account.sales_journal"/>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="period_id" ref="account.period_10"/>
-			<field name="date">time.strftime('%Y-%m-%d')</field>
+			<field name="date" eval="time.strftime('%Y-%m-%d')"/>
 		</record>
 		<record id="account_bank_statement_line_paymentpos0" model="account.bank.statement.line">
 			<field name="partner_id" ref="base.res_partner_agrolait"/>
@@ -87,7 +87,7 @@
 			<field name="account_id" ref="account.a_recv"/>
 			<field name="journal_id">Cash Journal - (test)</field>
 			<field eval="[(6,0,[])]" name="move_ids"/>
-			<field name="date">time.strftime('%Y-%m-%d')</field>
+			<field name="date" eval="time.strftime('%Y-%m-%d')"/>
 			<field eval="450.0" name="amount"/>
 			<field eval="0" name="is_acc"/>
 			<field eval="0" name="am_out"/>
@@ -98,18 +98,18 @@
 		<record id="stock_picking_out0" model="stock.picking">
 			<field name="origin">POS/019</field>
 			<field model="pos.order" name="pos_order" search="[('name', '=', u'POS/019')]"/>
-			<field name="date_done">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="date_done" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 			<field eval="1" name="auto_picking"/>
 			<field name="move_type">direct</field>
 			<field name="company_id" ref="base.main_company"/>
 			<field name="note">POS notes </field>
 			<field name="state">done</field>
 			<field name="type">out</field>
-			<field name="min_date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
-			<field name="date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="min_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+			<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 			<field name="name">OUT/00019</field>
 			<field name="invoice_state">none</field>
-			<field name="max_date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="max_date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 		</record>
 		<record id="stock_move_stockmovepos0" model="stock.move">
 			<field name="origin">POS/019</field>
@@ -123,12 +123,12 @@
 			<field name="company_id" ref="base.main_company"/>
 			<field name="state">done</field>
 			<field eval="[(6,0,[])]" name="move_history_ids"/>
-			<field name="date_expected">time.strftime('%Y-%m-%d %H:%M:%S')</field>
-			<field name="date">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="date_expected" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
+			<field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 			<field name="name">Stock move (POS 12)</field>
 			<field eval="[(6,0,[])]" name="move_history_ids2"/>
 			<field name="product_id" ref="product.product_product_pc1"/>
-			<field name="date_planned">time.strftime('%Y-%m-%d %H:%M:%S')</field>
+			<field name="date_planned" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
 			<field name="location_dest_id" ref="stock.stock_location_customers"/>
 			<field model="stock.picking" name="picking_id" search="[('name', '=', u'OUT/00019')]"/>
 		</record>
@@ -166,7 +166,7 @@
 		
 		<record id="line1_pos" model="pos.order.line">
             <field name="order_id" ref="order_pos1"/>
-            <field name="date_planned">time.strftime('%Y-%m-%d')</field>
+            <field name="date_planned" eval="time.strftime('%Y-%m-%d')"/>
             <field name="name">[PC3] Medium PC</field>
             <field name="product_id" ref="product.product_product_pc3"/>
             <field model="res.company" name="company_id" search="[]"/>
@@ -178,7 +178,7 @@
         
         <record id="line12_pos" model="pos.order.line">
             <field name="order_id" ref="order_pos1"/>
-            <field name="date_planned">time.strftime('%Y-%m-%d')</field>
+            <field name="date_planned" eval="time.strftime('%Y-%m-%d')"/>
             <field name="name">[PC2] Basic+ PC (assembly on order)</field>
             <field name="product_id" ref="product.product_product_pc2"/>
             <field model="res.company" name="company_id" search="[]"/>
@@ -190,7 +190,7 @@
         
         <record id="line2_pos" model="pos.order.line">
             <field name="order_id" ref="order_pos2"/>
-            <field name="date_planned">time.strftime('%Y-%m-%d')</field>
+            <field name="date_planned" eval="time.strftime('%Y-%m-%d')"/>
             <field name="name">[PC1] Basic PC</field>
             <field name="product_id" ref="product.product_product_pc1"/>
             <field model="res.company" name="company_id" search="[]"/>

=== modified file 'survey/survey.py'
--- survey/survey.py	2010-12-30 09:58:09 +0000
+++ survey/survey.py	2011-01-06 06:50:17 +0000
@@ -714,7 +714,7 @@
         'email': fields.char("E-mail", size=64),
         'survey_id': fields.many2one("survey", "Survey", required=1, ondelete='cascade'),
         'response': fields.many2one('survey.response', 'Answer'),
-        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Wating Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
+        'state': fields.selection([('draft','Draft'),('waiting_answer', 'Waiting Answer'),('done', 'Done'),('cancel', 'Cancelled')], 'State', readonly=1)
     }
     _defaults = {
         'state': lambda * a: 'draft',