← Back to branch summary

~sebastien.beau/magentoerpconnect/oerp6.1-cleanning

« back to all changes in this revision

Viewing changes to magentoerpconnect/magerp_data.xml

  • Committer: Sébastien Beau
  • Date: 2012-12-07 13:18:05 UTC
  • mfrom: (676.2.39 magentoerpconnect)
  • Revision ID: sebastien.beau@akretion.com-20121207131805-o4tgotytj3ku580m
[MERGE] merge with cleaning branch, please do not forget to update dependency, product-extra-addons, openobject-extention, e-commerce-adddons. 

magentoerpconnect :
- REFACTOR
    - refactor the invoice syncronisation 
        2 modules are available, 1 for using Magento Invoice, one for using OpenERP invoice
        moreover if invoice syncronisation failed try to map if an existing one already exist : fonction => map_magento_order 
    - refactor view for compatibility in multi-e-commerce solution
    - NAME REFACTOR : by default use only name if you need to use the lastname and firstname please first update magentoerpconnect and them install magentoerpconnect_partner_surname. DO IT ON A DATABASE TEST BEFORE. If you have any trouble please open a bug on lp
    - use new api for moving the category and updating the stock information

    ADD
        - add reporting when exporting stock level

Show diffs side-by-side

added added

removed removed

Lines of Context:
magentoerpconnect/magerp_data.xml
1
1
<?xml version="1.0"?>
2
2
<openerp>
3
 
        <data noupdate="1">
4
 
                
 
3
    <data noupdate="1">
 
4
 
5
5
 
6
6
        <record forcecreate="True" id="ir_cron_import_orders_scheduler_action" model="ir.cron">
7
7
            <field name="name">Magento Import Orders</field>
122
122
<!--
123
123
 
124
124
        <record id="payment_type1" model="base.sale.payment.type">
125
 
                        <field name="name">checkmo;cashondelivery</field>
126
 
                        <field name="order_policy">manual</field>
127
 
                </record>
128
 
                
 
125
            <field name="name">checkmo;cashondelivery</field>
 
126
            <field name="order_policy">manual</field>
 
127
        </record>
 
128
 
129
129
        <record id="payment_type2" model="base.sale.payment.type">
130
 
                        <field name="name">ccsave;free;googlecheckout;paypayl_express;paybox_system;paypal_standard;servired_standard;bbva;cofidis</field>
131
 
                        <field name="order_policy">prepaid</field>
132
 
                </record>
 
130
            <field name="name">ccsave;free;googlecheckout;paypayl_express;paybox_system;paypal_standard;servired_standard;bbva;cofidis</field>
 
131
            <field name="order_policy">prepaid</field>
 
132
        </record>
133
133
 
134
134
-->
135
 
        </data>
 
135
    </data>
136
136
</openerp>