openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #02007
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
mtr(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#600547 Invoice totals not updated when a line is moved (store={...} bug?)
https://bugs.launchpad.net/bugs/600547
#690895 copy account.move crash
https://bugs.launchpad.net/bugs/690895
#694144 [6.0] sales manager dashboard - sales by month - sql query error, usabiliy
https://bugs.launchpad.net/bugs/694144
#695632 [RC1]Two same fields creating problem in web-client
https://bugs.launchpad.net/bugs/695632
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/45348
hello sir,
[IMP] crm_helpdesk,hr_expense,purchase,purchase_requisition,survey: changed static value of date fields to current date value."
Thanks
mtr
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1/+merge/45348
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr1 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'crm_helpdesk/crm_helpdesk_demo.xml'
--- crm_helpdesk/crm_helpdesk_demo.xml 2010-12-30 09:58:09 +0000
+++ crm_helpdesk/crm_helpdesk_demo.xml 2011-01-06 11:28:11 +0000
@@ -9,7 +9,7 @@
<field name="priority">3</field>
<field name="state">draft</field>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="date">2010-07-04 11:10:36</field>
+ <field name="date" eval="time.strftime('%Y-%m-04 11:10:36')"/>
<field name="name">Download old version of OpenERP? </field>
<field eval=""Is there any link to download old versions of OpenERP?"" name="description"/>
</record>
@@ -22,7 +22,7 @@
<field name="priority">3</field>
<field name="state">draft</field>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="date">2010-07-12 11:12:09</field>
+ <field name="date" eval="time.strftime('%Y-%m-12 11:12:09')"/>
<field name="name">Can not able to connect to Server</field>
<field eval=""I am not able to connect Server, Can anyone help?"" name="description"/>
</record>
@@ -35,7 +35,7 @@
<field name="priority">2</field>
<field name="state">draft</field>
<field name="section_id" ref="crm.section_sales_department"/>
- <field name="date">2010-07-12 11:13:10</field>
+ <field name="date" eval="time.strftime('%Y-%m-12 11:13:10')"/>
<field name="name">Documentation for CRM?</field>
<field eval=""Can anyone give link of document for CRM"" name="description"/>
</record>
@@ -49,7 +49,7 @@
<field name="company_id" ref="base.main_company"/>
<field name="priority">3</field>
<field name="state">draft</field>
- <field name="date">2010-07-12 11:15:17</field>
+ <field name="date" eval="time.strftime('%Y-%m-12 11:15:17')"/>
<field name="name">How to create a new module</field>
<field eval=""How can I create new module in OpenERP?"" name="description"/>
</record>
=== modified file 'hr_expense/hr_expense_demo.xml'
--- hr_expense/hr_expense_demo.xml 2010-12-30 09:58:09 +0000
+++ hr_expense/hr_expense_demo.xml 2011-01-06 11:28:11 +0000
@@ -44,13 +44,13 @@
<field name="user_id" ref="base.user_root"/>
<field name="name">May Expenses</field>
<field name="company_id" ref="base.main_company"/>
- <field name="date">2010-05-03</field>
+ <field name="date" eval="time.strftime('%Y-%m-03')"/>
<field name="state">draft</field>
</record>
<record id="hr_expense_line_travelbycarcustomerseagatedouble0" model="hr.expense.line">
<field name="name">Travel by Air</field>
- <field name="date_value">2010-05-03</field>
+ <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
<field name="analytic_account" ref="account.analytic_consultancy"/>
<field name="product_id" ref="product_product_expense_air"/>
<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
@@ -61,7 +61,7 @@
<record id="hr_expense_line_basicpcserverforseagate0" model="hr.expense.line">
<field name="name">Basic PC - Server for Seagate</field>
- <field name="date_value">2010-05-03</field>
+ <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
<field name="analytic_account" ref="account.analytic_seagate_p2"/>
<field name="product_id" ref="product.product_product_pc4"/>
<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'May Expenses')]"/>
@@ -79,13 +79,13 @@
<field name="user_id" ref="base.user_root"/>
<field name="name">Travel Expenses</field>
<field name="company_id" ref="base.main_company"/>
- <field name="date">2010-04-20</field>
+ <field name="date" eval="time.strftime('%Y-%m-20')"/>
<field name="state">draft</field>
</record>
<record id="hr_expense_line_hotelexpensesthymbra0" model="hr.expense.line">
<field name="name">Hotel Expenses - Thymbra</field>
- <field name="date_value">2010-05-03</field>
+ <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
<field name="analytic_account" ref="account.analytic_thymbra"/>
<field name="product_id" ref="product_product_expense_hotel"/>
<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
@@ -96,7 +96,7 @@
<record id="hr_expense_line_car_travel" model="hr.expense.line">
<field name="name">Bruxelles - Paris</field>
- <field name="date_value">2010-05-03</field>
+ <field name="date_value" eval="time.strftime('%Y-%m-03')"/>
<field name="analytic_account" ref="account.analytic_thymbra"/>
<field name="product_id" ref="product_product_expense_car"/>
<field model="hr.expense.expense" name="expense_id" search="[('name', '=', u'Travel Expenses')]"/>
=== modified file 'purchase/purchase_demo.xml'
--- purchase/purchase_demo.xml 2010-12-30 09:58:09 +0000
+++ purchase/purchase_demo.xml 2011-01-06 11:28:11 +0000
@@ -26,7 +26,7 @@
<record id="line1_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase1"/>
- <field name="date_planned">2010/09/15</field>
+ <field name="date_planned" eval="time.strftime('%Y/%m/%d')"/>
<field name="name">New server config + material</field>
<field model="product.product" name="product_id" search="[]"/>
<field model="product.uom" name="product_uom" search="[]"/>
@@ -36,7 +36,7 @@
<record id="line2_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase1"/>
- <field name="date_planned">2010/09/15</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 name="product_uom" ref="product.product_uom_unit"/>
@@ -46,7 +46,7 @@
<record id="line3_purchase" model="purchase.order.line">
<field name="order_id" ref="order_purchase2"/>
- <field name="date_planned">2010/09/15</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_pc1"/>
<field name="product_uom" ref="product.product_uom_unit"/>
=== modified file 'purchase_requisition/purchase_requisition_demo.xml'
--- purchase_requisition/purchase_requisition_demo.xml 2010-12-30 09:58:09 +0000
+++ purchase_requisition/purchase_requisition_demo.xml 2011-01-06 11:28:11 +0000
@@ -11,7 +11,7 @@
<record id="order_purchase_requisition1" model="purchase.requisition">
<field name="user_id" model="res.users"/>
<field name="exclusive">multiple</field>
- <field name="date_start">2010/09/16 15:56:14</field>
+ <field name="date_start" eval="time.strftime('%Y/%m/%d %H:%M:%S')"/>
<field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
</record>
=== modified file 'survey/survey_demo.xml'
--- survey/survey_demo.xml 2010-12-30 09:58:09 +0000
+++ survey/survey_demo.xml 2011-01-06 11:28:11 +0000
@@ -29,7 +29,7 @@
<field name="tot_comp_survey">1</field>
<field name="tot_start_survey">1</field>
<field name="response_user">5</field>
- <field name="date_open">2010-03-03 14:25:03</field>
+ <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
</record>
<record id="survey_page_who_are_you" model="survey.page">
@@ -505,7 +505,7 @@
<field name="tot_comp_survey">1</field>
<field name="tot_start_survey">1</field>
<field name="response_user">5</field>
- <field name="date_open">2010-03-03 14:25:03</field>
+ <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
</record>
<record id="survey_page_odoo_who_are_you" model="survey.page">
@@ -2827,21 +2827,21 @@
<data noupdate="1">
<record id="survey_history_0" model="survey.history">
- <field name="date">2010-03-03 14:25:03</field>
+ <field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
<field name="survey_id" ref="survey.survey_partner_feedback"/>
<field name="user_id" ref="base.user_root"/>
</record>
</data>
<data noupdate="1">
<record id="survey_history_1" model="survey.history">
- <field name="date">2010-03-03 14:29:36</field>
+ <field name="date" eval="time.strftime('%Y-%m-%d %H:%M:%S')"/>
<field name="survey_id" ref="survey.survey_odoo_feedback"/>
<field name="user_id" ref="base.user_root"/>
</record>
</data>
<data noupdate="1">
<record id="survey_response_0" model="survey.response">
- <field name="date_create">2010-03-03 14:25:03.603599</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.603599'"/>
<field name="state">done</field>
<field name="survey_id" ref="survey.survey_partner_feedback"/>
<field name="user_id" ref="base.user_root"/>
@@ -2850,7 +2850,7 @@
</data>
<data noupdate="1">
<record id="survey_response_1" model="survey.response">
- <field name="date_create">2010-03-03 14:29:36.247905</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.247905'"/>
<field name="state">done</field>
<field name="survey_id" ref="survey.survey_odoo_feedback"/>
<field name="user_id" ref="base.user_root"/>
@@ -2859,7 +2859,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_0" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:03.631622</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.631622'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_your_customers"/>
@@ -2867,7 +2867,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_1" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:03.653849</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.653849'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_located"/>
@@ -2875,7 +2875,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_2" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:03.671836</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.671836'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_company_size"/>
@@ -2883,7 +2883,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_3" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:03.689999</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.689999'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_offical_partner"/>
@@ -2891,7 +2891,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_4" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:03.706175</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.706175'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="single_text">OpenERP SA</field>
@@ -2900,7 +2900,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_5" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:29.087116</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.087116'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_partnership_contract"/>
@@ -2908,7 +2908,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_6" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:29.107571</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.107571'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_contract_customers"/>
@@ -2916,7 +2916,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_7" model="survey.response.line">
- <field name="date_create">2010-03-03 14:25:29.126023</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.126023'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_sell_to_your_customers"/>
@@ -2924,7 +2924,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_8" model="survey.response.line">
- <field name="date_create">2010-03-03 14:26:14.844451</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.844451'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_partners_about"/>
@@ -2932,7 +2932,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_9" model="survey.response.line">
- <field name="date_create">2010-03-03 14:26:14.872224</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.872224'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_launchpad_reporting"/>
@@ -2940,7 +2940,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_10" model="survey.response.line">
- <field name="date_create">2010-03-03 14:26:14.897764</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.897764'"/>
<field name="state">skip</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_partners_on_which_subjects"/>
@@ -2948,7 +2948,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_11" model="survey.response.line">
- <field name="date_create">2010-03-03 14:26:14.918989</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.918989'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_0"/>
<field name="question_id" ref="survey.survey_question_Leads"/>
@@ -2956,7 +2956,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_12" model="survey.response.line">
- <field name="date_create">2010-03-03 14:29:36.27459</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.27459'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_discover_odoo"/>
@@ -2964,7 +2964,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_13" model="survey.response.line">
- <field name="date_create">2010-03-03 14:29:36.301461</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.301461'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_company_sector"/>
@@ -2972,7 +2972,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_14" model="survey.response.line">
- <field name="date_create">2010-03-03 14:29:36.33203</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.33203'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="single_text">OpenERP SA</field>
@@ -2981,7 +2981,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_15" model="survey.response.line">
- <field name="date_create">2010-03-03 14:29:36.35911</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.35911'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_mange_with_odoo"/>
@@ -2989,7 +2989,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_16" model="survey.response.line">
- <field name="date_create">2010-03-03 14:30:11.376172</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.376172'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_continue_using_odoo"/>
@@ -2997,7 +2997,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_17" model="survey.response.line">
- <field name="date_create">2010-03-03 14:30:11.397675</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.397675'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_subscribe_to_odoo"/>
@@ -3005,7 +3005,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_18" model="survey.response.line">
- <field name="date_create">2010-03-03 14:30:11.414119</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.414119'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_configure_the_application"/>
@@ -3013,7 +3013,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_19" model="survey.response.line">
- <field name="date_create">2010-03-03 14:31:18.637519</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.637519'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_use"/>
@@ -3021,7 +3021,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_20" model="survey.response.line">
- <field name="date_create">2010-03-03 14:31:18.653091</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.653091'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="single_text">survey</field>
@@ -3030,7 +3030,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_21" model="survey.response.line">
- <field name="date_create">2010-03-03 14:31:18.669619</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.669619'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_give_your_opinion"/>
@@ -3038,7 +3038,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_22" model="survey.response.line">
- <field name="date_create">2010-03-03 14:31:18.691933</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.691933'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_you_think_about"/>
@@ -3046,7 +3046,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_23" model="survey.response.line">
- <field name="date_create">2010-03-03 14:32:08.47899</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.47899'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_dms"/>
@@ -3054,7 +3054,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_24" model="survey.response.line">
- <field name="date_create">2010-03-03 14:32:08.501274</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.501274'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_offer_opinion_about_odoo"/>
@@ -3062,7 +3062,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_25" model="survey.response.line">
- <field name="date_create">2010-03-03 14:32:08.523878</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.523878'"/>
<field name="state">skip</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_offer_comments_them_here"/>
@@ -3070,7 +3070,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_26" model="survey.response.line">
- <field name="date_create">2010-03-03 14:32:08.538988</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.538988'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_would_you_prefer_receive_your_prepaid_bill"/>
@@ -3078,7 +3078,7 @@
</data>
<data noupdate="1">
<record id="survey_response_line_27" model="survey.response.line">
- <field name="date_create">2010-03-03 14:32:08.555196</field>
+ <field name="date_create" eval="time.strftime('%Y-%m-%d %H:%M:%S')+'.555196'"/>
<field name="state">done</field>
<field name="response_id" ref="survey_response_1"/>
<field name="question_id" ref="survey.survey_question_odoo_support_services"/>
Follow ups
