openerp-community-reviewer team mailing list archive

["Yannick Vaucher @ Camptocamp" <yannick.vaucher@xxxxxxxxxxxxxx>]

Yannick Vaucher @ Camptocamp has proposed merging lp:~camptocamp/margin-analysis/7.0-port-product_historical_margin-xml-retab-yvr into lp:margin-analysis.

Requested reviews:
  Margin Analysis Core Editors (margin-analysis-core-editors)

For more details, see:
https://code.launchpad.net/~camptocamp/margin-analysis/7.0-port-product_historical_margin-xml-retab-yvr/+merge/190350

Pre-portage only retabing XML for readability
-- 
https://code.launchpad.net/~camptocamp/margin-analysis/7.0-port-product_historical_margin-xml-retab-yvr/+merge/190350
Your team Margin Analysis Core Editors is requested to review the proposed merge of lp:~camptocamp/margin-analysis/7.0-port-product_historical_margin-xml-retab-yvr into lp:margin-analysis.

=== modified file 'product_historical_margin/account_invoice_view.xml'
--- product_historical_margin/account_invoice_view.xml	2012-07-12 13:56:17 +0000
+++ product_historical_margin/account_invoice_view.xml	2013-10-10 12:25:44 +0000
@@ -1,81 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
   <data>
-      
-       <record id="view_invoice_line_tree_from_product" model="ir.ui.view">
-              <field name="name">account.invoice.line.from.product.tree</field>
-              <field name="model">account.invoice.line</field>
-              <field name="type">tree</field>
-              <field name="priority">20</field>
-              <field name="arch" type="xml">
-                  <tree string="Invoice Line">
-                      <field name="invoice_type"/>
-                      <field name="partner_id"/>
-                      <field name="invoice_user_id"/>
-                      <field name="invoice_id"/>
-                      <field name="invoice_date"/>
-                      <field name="name" invisible="1"/>
-                      <field name="product_id"/>
-                      <field name="account_id" invisible="1"/>
-                      <field name="quantity"/>
-                      <field name="uos_id"/>
-                      <field name="price_unit" invisible="1"/>
-                      <field name="discount" invisible="1"/>
-                      <field name="price_subtotal" invisible="1"/>
-                      <field name="subtotal_cost_price" invisible="1"/>
-                      <field name="company_id" invisible="1"/>
-                      <field name="subtotal_company"/>
-                      <field name="subtotal_cost_price_company"/>
-                      <field name="margin_absolute"/>
-                      <field name="margin_relative" invisible="context.get('group_by',False)"/>
-                  </tree>
-              </field>
-          </record>
-          
-        
-      <record id="view_account_invoice_line_filter" model="ir.ui.view">
-          <field name="name">account.invoice.line.select</field>
-          <field name="model">account.invoice.line</field>
-          <field name="type">search</field>
-          <field name="arch" type="xml">
-              <search string="Search Invoice Line">
-                 <group>
-                     <filter icon="terp-go-year" string="Year" 
-                             name="year"
-                             domain="[('invoice_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',time.strftime('%%Y-01-01'))]"
-                             help="year"/>
-                     <separator orientation="vertical"/>
-                     <filter icon="terp-go-month" string="Month"
-                             name="month"
-                             domain="[('invoice_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="current month"/>
-                     <filter icon="terp-go-month" string="Month-1"
-                             domain="[('invoice_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
-                             help="last month"/>
-                     <separator orientation="vertical"/>
-                      <field name="product_id"/>
-                      <field name="invoice_type"/>
-                      <field name="partner_id"/>
-                      <field name="invoice_user_id"/>
-                      <field name="invoice_date"/>
-                      <field name="account_id"/>
-                      <field name="company_id"/>
-                  </group>
-                  <newline/>
-                  <group expand="1" string="Group By...">
-                      <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
-                      <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'invoice_user_id'}"/>
-                      <separator orientation="vertical"/>
-                      <filter string="Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_id'}"/>
-                      <filter string="Invoice" icon="terp-folder-orange" domain="[]" context="{'group_by':'invoice_id'}"/>
-                      <separator orientation="vertical"/>
-                      <filter string="Invoice Type" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'invoice_type'}"/>
-                      <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
-                  </group>
-             </search>
-          </field>
-      </record>
+
+    <record id="view_invoice_line_tree_from_product" model="ir.ui.view">
+      <field name="name">account.invoice.line.from.product.tree</field>
+      <field name="model">account.invoice.line</field>
+      <field name="type">tree</field>
+      <field name="priority">20</field>
+      <field name="arch" type="xml">
+        <tree string="Invoice Line">
+          <field name="invoice_type"/>
+          <field name="partner_id"/>
+          <field name="invoice_user_id"/>
+          <field name="invoice_id"/>
+          <field name="invoice_date"/>
+          <field name="name" invisible="1"/>
+          <field name="product_id"/>
+          <field name="account_id" invisible="1"/>
+          <field name="quantity"/>
+          <field name="uos_id"/>
+          <field name="price_unit" invisible="1"/>
+          <field name="discount" invisible="1"/>
+          <field name="price_subtotal" invisible="1"/>
+          <field name="subtotal_cost_price" invisible="1"/>
+          <field name="company_id" invisible="1"/>
+          <field name="subtotal_company"/>
+          <field name="subtotal_cost_price_company"/>
+          <field name="margin_absolute"/>
+          <field name="margin_relative" invisible="context.get('group_by',False)"/>
+        </tree>
+      </field>
+    </record>
+
+
+    <record id="view_account_invoice_line_filter" model="ir.ui.view">
+      <field name="name">account.invoice.line.select</field>
+      <field name="model">account.invoice.line</field>
+      <field name="type">search</field>
+      <field name="arch" type="xml">
+        <search string="Search Invoice Line">
+          <group>
+            <filter icon="terp-go-year" string="Year" 
+                name="year"
+                domain="[('invoice_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                help="year"/>
+            <separator orientation="vertical"/>
+            <filter icon="terp-go-month" string="Month"
+                name="month"
+                domain="[('invoice_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                help="current month"/>
+            <filter icon="terp-go-month" string="Month-1"
+                domain="[('invoice_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('invoice_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                help="last month"/>
+            <separator orientation="vertical"/>
+            <field name="product_id"/>
+            <field name="invoice_type"/>
+            <field name="partner_id"/>
+            <field name="invoice_user_id"/>
+            <field name="invoice_date"/>
+            <field name="account_id"/>
+            <field name="company_id"/>
+          </group>
+          <newline/>
+          <group expand="1" string="Group By...">
+            <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/>
+            <filter string="Salesman" name='user' icon="terp-personal" context="{'group_by':'invoice_user_id'}"/>
+            <separator orientation="vertical"/>
+            <filter string="Account" icon="terp-folder-orange" domain="[]" context="{'group_by':'account_id'}"/>
+            <filter string="Invoice" icon="terp-folder-orange" domain="[]" context="{'group_by':'invoice_id'}"/>
+            <separator orientation="vertical"/>
+            <filter string="Invoice Type" icon="terp-stock_effects-object-colorize" domain="[]"  context="{'group_by':'invoice_type'}"/>
+            <filter name="product" string="Product" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+          </group>
+        </search>
+      </field>
+    </record>
 
   </data>
 </openerp>
-

=== modified file 'product_historical_margin/product_view.xml'
--- product_historical_margin/product_view.xml	2012-11-14 15:53:00 +0000
+++ product_historical_margin/product_view.xml	2013-10-10 12:25:44 +0000
@@ -9,8 +9,8 @@
       <field name="type">form</field>
       <field name="arch" type="xml">
         <field name="standard_margin_rate" position="after">
-            <field name="margin_absolute" />
-            <field name="margin_relative" />
+          <field name="margin_absolute" />
+          <field name="margin_relative" />
         </field>
       </field>
     </record>

=== modified file 'product_historical_margin/wizard/historical_margin_view.xml'
--- product_historical_margin/wizard/historical_margin_view.xml	2012-07-12 13:56:17 +0000
+++ product_historical_margin/wizard/historical_margin_view.xml	2013-10-10 12:25:44 +0000
@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <openerp>
-    <data>
-        <record id="view_historical_margin" model="ir.ui.view">
-            <field name="name">historical.margin.form</field>
-            <field name="model">historical.margin</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Historical Margin Properties">
-                    <group colspan="4">
-                        <field name="from_date" />
-                        <field name="to_date"/>
-                        <field name="product_ids" invisible="1"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4" col="6">
-                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
-                        <button icon="terp-gtk-go-back-rtl" string="Compute margins" name="action_open_window" type="object"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_product_margin_view" model="ir.actions.act_window">
-            <field name="name">Product Historical Margin</field>
-            <field name="res_model">historical.margin</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_historical_margin"/>
-            <field name="target">new</field>
-        </record>
-        
-        
-        <menuitem icon="STOCK_INDENT" action="action_product_margin_view"
-            id="menu_action_product_margin_tree"
-            parent="account.menu_finance_statistic_report_statement" />
-
-        
-        <!-- Remove it for right management <act_window name="Product Historical Margins"
+  <data>
+    <record id="view_historical_margin" model="ir.ui.view">
+      <field name="name">historical.margin.form</field>
+      <field name="model">historical.margin</field>
+      <field name="type">form</field>
+      <field name="arch" type="xml">
+        <form string="Historical Margin Properties">
+          <group colspan="4">
+            <field name="from_date" />
+            <field name="to_date"/>
+            <field name="product_ids" invisible="1"/>
+          </group>
+          <separator string="" colspan="4"/>
+          <group colspan="4" col="6">
+            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+            <button icon="terp-gtk-go-back-rtl" string="Compute margins" name="action_open_window" type="object"/>
+          </group>
+        </form>
+      </field>
+    </record>
+
+    <record id="action_product_margin_view" model="ir.actions.act_window">
+      <field name="name">Product Historical Margin</field>
+      <field name="res_model">historical.margin</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="view_id" ref="view_historical_margin"/>
+      <field name="target">new</field>
+    </record>
+
+
+    <menuitem icon="STOCK_INDENT" action="action_product_margin_view"
+        id="menu_action_product_margin_tree"
+        parent="account.menu_finance_statistic_report_statement" />
+
+
+    <!-- Remove it for right management <act_window name="Product Historical Margins"
                     res_model="historical.margin"
                     src_model="product.product"
                     view_mode="form"
@@ -46,5 +45,5 @@
                     id="historical_margin_act_window"/> -->
 
 
-    </data>
+  </data>
 </openerp>