Merge lp:~altegra/pepess/pepess_dev_carlos_changes_pepess_conf into lp:pepess

[Carlos Blanco - http://www.grupoaltegra.com]

[FIX] The company name was changed in data/data and added data/data to use point of sale

[Carlos Blanco - http://www.grupoaltegra.com (carlos-blanco)]

Cambios al nombre de pepess por la restricción del nombre que es igual y se agrego data/data para que se use el punto de venta

[Moisés López - http://www.vauxoo.com (moylop260)]

review: Approve

=== modified file 'pepess_conf/__openerp__.py'
--- pepess_conf/__openerp__.py	2014-10-14 21:51:48 +0000
+++ pepess_conf/__openerp__.py	2014-11-12 14:40:09 +0000
@@ -41,6 +41,7 @@
     "depends" : ["base",
                  "account", 
                  "sale",
+                 "point_of_sale",
                  "stock",
                  "purchase",
                  "l10n_mx_partner_address"
@@ -55,6 +56,7 @@
         "data/sale_shop.xml",
         "data/res_currency.xml",
         "data/fiscal_year.xml",
+        "data/point_of_sale.xml",
     ],
     "update_xml" : [],
     "active": False,
 
=== modified file 'pepess_conf/data/account_journal.xml'
--- pepess_conf/data/account_journal.xml	2014-10-22 22:10:27 +0000
+++ pepess_conf/data/account_journal.xml	2014-11-12 14:40:09 +0000
@@ -36,6 +36,16 @@
             <field name="user_id" ref="pepess_conf.user_root_pepess_shop1"/>
             <field name="company_id" eval="ref('pepess_conf.main_company_pepess')"/> 
         </record>
+        
+        <record id="cash_journal_pepess_shop_pos1" model="account.journal">
+            <field name="name">Diario de efectivo TPV Pepess Shop 1</field>
+            <field name="code">TPVE</field>
+            <field name="type">cash</field>
+            <field name="journal_user">1</field>
+            <field name="sequence_id" ref="pepess_conf.sequence_cash_journal_pepess_shop_pos1"/>
+            <field name="user_id" ref="pepess_conf.user_root_pepess_shop1"/>
+            <field name="company_id" eval="ref('pepess_conf.main_company_pepess')"/>
+        </record>
 
         <record id="cash_journal_pepess_shop1" model="account.journal">
             <field name="name">Diario de efectivo Pepess Shop 1</field>
 
=== modified file 'pepess_conf/data/ir_sequence.xml'
--- pepess_conf/data/ir_sequence.xml	2014-10-14 21:51:48 +0000
+++ pepess_conf/data/ir_sequence.xml	2014-11-12 14:40:09 +0000
@@ -2,6 +2,16 @@
 <openerp>
     <data noupdate="1">
         
+        <record id="sequence_pos_pepess_shop1" model="ir.sequence">
+            <field name="name">TPV SEQ Pepess Shop 1</field>
+            <field name="prefix">SP1</field>
+            <field name="company_id" ref="pepess_conf.main_company_pepess"/>
+            <field eval="4" name="padding"/>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field name="implementation">no_gap</field>
+        </record>
+        
         <record id="sequence_sales_journal_pepess_shop1" model="ir.sequence">
             <field name="name">Pepess Shop 1 Ventas</field>
             <field name="prefix"></field>
@@ -52,6 +62,16 @@
             <field name="implementation">no_gap</field>
         </record>
         
+        <record id="sequence_cash_journal_pepess_shop_pos1" model="ir.sequence">
+            <field name="name">Efectivo TPV Pepess Shop 1</field>
+            <field name="prefix">S1002/%(year)s/</field>
+            <field name="company_id" ref="pepess_conf.main_company_pepess"/>
+            <field eval="4" name="padding"/>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field name="implementation">no_gap</field>
+        </record>
+        
         <record id="sequence_bank_journal_pepess_shop1" model="ir.sequence">
             <field name="name">Banco Pepess Shop 1</field>
             <field name="prefix">S1BAN/%(year)s/</field>
 
=== added file 'pepess_conf/data/point_of_sale.xml'
--- pepess_conf/data/point_of_sale.xml	1970-01-01 00:00:00 +0000
+++ pepess_conf/data/point_of_sale.xml	2014-11-12 14:40:09 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<openerp>
+    <data noupdate="1">
+
+<!--
+        Pepess Shop 1
+-->
+        <record id="cash_journal_pepess_shop_pos1" model="pos.config">
+            <field name="name">Pepess Shop 1</field>
+            <field name="shop_id" ref="pepess_conf.sale_shop_pepess_shop1"/>
+            <field name="journal_id" ref="pepess_conf.sales_journal_pepess_shop1"/>
+            <field name="sequence_id" ref="pepess_conf.sequence_pos_pepess_shop1"/>
+            <field name="group_by">1</field>
+            <field name="journal_ids" eval="[(4, ref('pepess_conf.cash_journal_pepess_shop_pos1'))]"/>
+            
+        </record>
+        
+    </data>
+</openerp>
 
=== modified file 'pepess_conf/data/res_company.xml'
--- pepess_conf/data/res_company.xml	2014-10-22 22:13:48 +0000
+++ pepess_conf/data/res_company.xml	2014-11-12 14:40:09 +0000
@@ -4,7 +4,7 @@
         
 <!-- Compania Padre -->
         <record id="res_company_pepess" model="res.company">
-            <field name="name">CORPORATIVO PEPE'SS SA DE CV</field>
+            <field name="name">CORPORATIVO PEPE'SS SA DE CV1</field>
             <field name="street">Boulevard Quetzalcóatl</field>
             <field name="street2">Col. Santa Maria El Chico</field>
             <field name="l10n_mx_street4">S/N</field>
@@ -69,7 +69,7 @@
             <field name="vat">MXAAA010101AAA</field>
             <field name="rml_header1">Your Company Tagline</field>
             <field name="currency_id" ref="base.MXN"/>
-            <field name="parenta_id" ref="res_company_pepess"/>
+            <field name="parent_id" ref="res_company_pepess"/>
         </record>
             
         <record id="main_partner_pepess" model="res.partner" context="{'default_is_company': True}">