[IMP] point_of_sale:remove the account_receivable in res.company and contact_mode_id

bzr revid: sbh@tinyerp.com-20100420133628-rzr9rneiutktgdhs

diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index c87efa4..d064e65 100644 (file)
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -43,30 +43,6 @@ class pos_config_journal(osv.osv):
     }
 
 pos_config_journal()
-
-class res_mode_contact(osv.osv):
-
-    """ Contact mode for Partner  """    
-    
-    _name = "res.mode.contact"
-    _description = "Contact mode"
-    
-    _columns={
-        'name': fields.char('Mode', size=64, select=1),
-        'active': fields.boolean('Active', select=2),
-    }
-res_mode_contact()
-
-class contact_mode_partner(osv.osv):
-
-  
-    _inherit = 'res.partner'
-    _columns = {
-        'contact_mode_id': fields.many2one('res.mode.contact','Contact Mode'),
-     }
-contact_mode_partner()
-
-
 class pos_company_discount(osv.osv):
   
     """ Company Discount and Cashboxes """   
@@ -75,8 +51,6 @@ class pos_company_discount(osv.osv):
     _columns = {
         'company_discount': fields.float('Max Discount(%)', digits=(16,2)),
         'max_diff': fields.float('Max Difference for Cashboxes', digits=(16,2)),
-        'account_receivable': fields.many2one('account.account',
-            'Default Receivable', states={'draft': [('readonly', False)]}),
      }
 
 pos_company_discount()

diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml
index 617060e..b69bc04 100644 (file)
--- a/addons/point_of_sale/pos_view.xml
+++ b/addons/point_of_sale/pos_view.xml
@@ -144,7 +144,6 @@
             <field name="view_type">form</field>
             <field name="view_id" ref="view_pos_pos_form"/>
             <field name="domain">[['date_order','>=',time.strftime('%Y-%m-%d')]]</field>
-            <field name="search_view_id" ref="view_pos_order_filter"/>   
         </record>
 
 
@@ -695,47 +694,10 @@ invoiced
                     <page string="Other">
                       <field  name="company_discount" colspan="4"/>
                       <field  name="max_diff" colspan="4"/>
-                      <field  name="account_receivable" required="1" colspan="4"/>
                     </page>
                 </notebook>
                </field>
                </record>
-
-
-        <record model="ir.ui.view" id="form_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-             <form string="Contact Mode">
-                    <field  name="name" select="1"/>
-                    <field  name="active" select="2"/>
-              </form>
-            </field>
-          </record>
-
-        <record model="ir.ui.view" id="tree_mode_p_contact">
-            <field name="name">Contact Mode</field>
-            <field name="model">res.mode.contact</field>
-            <field name="type">tree</field>
-            <field name="arch" type="xml">
-             <tree string="Contact Mode">
-                    <field  name="name"/>
-                    <field  name="active"/>
-              </tree>
-            </field>
-          </record>
-
-        <record model="ir.actions.act_window" id="action_mode_p">
-            <field name="name">Contact Mode</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.mode.contact</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <menuitem name="Contact Mode" parent="base.menu_base_config" action="action_mode_p" id="menu_mode_po"/>
-
         <record model="ir.ui.view" id="view_partner_contact">
             <field name="name">view.partner.contact</field>
             <field name="model">res.partner</field>

diff --git a/addons/point_of_sale/security/ir.model.access.csv b/addons/point_of_sale/security/ir.model.access.csv
index 0cfc0fa..599df95 100644 (file)
--- a/addons/point_of_sale/security/ir.model.access.csv
+++ b/addons/point_of_sale/security/ir.model.access.csv
@@ -13,7 +13,6 @@
 "access_sale_shop_pos_user","sale.shop pos_user","sale.model_sale_shop","point_of_sale.group_pos_user",1,0,0,0
 "access_pos_order_stock_worker","pos.order stock_worker","model_pos_order","stock.group_stock_user",1,0,0,0
 "access_stock_move_pos_user","stock.move pos_user","stock.model_stock_move","point_of_sale.group_pos_user",1,1,1,1
-"access_res_mode_contact","res.mode.contact","model_res_mode_contact","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos","report.sales.by.user.pos","model_report_sales_by_user_pos","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_user_pos_month","report.sales.by.user.pos.month","model_report_sales_by_user_pos_month","point_of_sale.group_pos_user",1,0,0,0
 "access_report_sales_by_margin_pos","report.sales.by.margin.pos","model_report_sales_by_margin_pos","point_of_sale.group_pos_user",1,0,0,0

diff --git a/addons/point_of_sale/singer_statement_demo.xml b/addons/point_of_sale/singer_statement_demo.xml
index edc8299..68f889c 100644 (file)
--- a/addons/point_of_sale/singer_statement_demo.xml
+++ b/addons/point_of_sale/singer_statement_demo.xml
@@ -316,17 +316,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
-          <record id="point_of_sale.pos_order_posadvance" model="pos.order">
-      <field name="sale_journal" ref="sales_journal_comp2"/>
-    </record>
-
-
-        <record id="base.main_company" model="res.company">
-            <field name="account_receivable" ref="account.a_recv"/>
-        </record>
           <record id="point_of_sale.pos_order_posadvance" model="pos.order">
       <field name="sale_journal" ref="sales_journal_comp2"/>
     </record>