[tryton-debian-vcs] tryton-modules-analytic-sale branch upstream created. 29b4a92b5e9e15d72e1de1dc774dbb48eb206746

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed Nov 27 16:58:53 UTC 2013


The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-sale.git;a=commitdiff;h=29b4a92b5e9e15d72e1de1dc774dbb48eb206746
commit 29b4a92b5e9e15d72e1de1dc774dbb48eb206746
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sun Nov 24 17:26:32 2013 +0100

    Adding upstream version 3.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 034335d..09d92d7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
 Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 8dc323c..b8545c4 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_sale
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_analytic_sale
         =====================
         
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/sl_SI.po b/locale/sl_SI.po
new file mode 100644
index 0000000..5d070a2
--- /dev/null
+++ b/locale/sl_SI.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Analitični konti"
diff --git a/sale.py b/sale.py
index d9918a8..5c021b8 100644
--- a/sale.py
+++ b/sale.py
@@ -36,7 +36,9 @@ class SaleLine:
                 ['analytic_accounts'])['analytic_accounts']
 
         res.update(AnalyticAccount.analytic_accounts_fields_get(
-                analytic_accounts_field, fields_names))
+                analytic_accounts_field, fields_names,
+                states=cls.analytic_accounts.states,
+                required_states=Eval('type') == 'line'))
         return res
 
     @classmethod
diff --git a/setup.py b/setup.py
index e202d27..870d755 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name='trytond_analytic_sale',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Russian',
+        'Natural Language :: Slovenian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 82d80c4..ce62a2a 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
 #this repository contains the full copyright notices and license terms.
 
 from .test_analytic_sale import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index 7eaeabd..44e7839 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.8.0
+version=3.0.0
 depends:
     analytic_account
     analytic_invoice
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 805d878..1f11c3b 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-sale
-Version: 2.8.0
+Version: 3.0.0
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
 Description: trytond_analytic_sale
         =====================
         
@@ -58,6 +58,7 @@ Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 1ea5ee9..bea2047 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -21,6 +21,7 @@ locale/es_ES.po
 locale/fr_FR.po
 locale/nl_NL.po
 locale/ru_RU.po
+locale/sl_SI.po
 trytond_analytic_sale.egg-info/PKG-INFO
 trytond_analytic_sale.egg-info/SOURCES.txt
 trytond_analytic_sale.egg-info/dependency_links.txt
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index b56a3be..946384c 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 2.8, < 2.9
-trytond_analytic_invoice >= 2.8, < 2.9
-trytond_sale >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_analytic_account >= 3.0, < 3.1
+trytond_analytic_invoice >= 3.0, < 3.1
+trytond_sale >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
commit c41c23f7b4ca0f6618955c3bb1126b95057ed442
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu May 2 00:35:23 2013 +0200

    Adding upstream version 2.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index 39c1db7..034335d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Version 2.6.1 - 2012-12-23
+Version 2.8.0 - 2013-04-22
 * Bug fixes (see mercurial logs for details)
 
 Version 2.6.0 - 2012-10-22
diff --git a/COPYRIGHT b/COPYRIGHT
index 26f578f..da9ef80 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2012 Cédric Krier.
+Copyright (C) 2008-2013 Cédric Krier.
 Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2012 B2CK SPRL.
+Copyright (C) 2008-2013 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index 44969c7..18ce53c 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include CHANGELOG
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 6d94d43..8dc323c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_sale
-Version: 2.6.1
+Version: 2.8.0
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_analytic_sale
         =====================
         
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 518fc49..78cb58b 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -4,4 +4,4 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
 
 msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Счета аналитики"
diff --git a/sale.py b/sale.py
index f2b4793..d9918a8 100644
--- a/sale.py
+++ b/sale.py
@@ -56,8 +56,7 @@ class SaleLine:
         res = super(SaleLine, cls).read(ids, fields_names=fields_names2)
 
         if not fields_names:
-            fields_names = list(set(cls._fields.keys()
-                    + cls._inherit_fields.keys()))
+            fields_names = cls._fields.keys()
 
         root_ids = []
         for field in fields_names:
@@ -70,41 +69,43 @@ class SaleLine:
             lines = cls.browse(ids)
             for line in lines:
                 for root_id in root_ids:
-                    id2record[line.id]['analytic_account_' \
-                            + str(root_id)] = None
+                    id2record[line.id]['analytic_account_'
+                        + str(root_id)] = None
                 if line.type != 'line':
                     continue
                 if not line.analytic_accounts:
                     continue
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in root_ids:
-                        id2record[line.id]['analytic_account_' \
-                                + str(account.root.id)] = account.id
+                        id2record[line.id]['analytic_account_'
+                            + str(account.root.id)] = account.id
                         for field in fields_names:
-                            if field.startswith('analytic_account_' + \
-                                    str(account.root.id) + '.'):
+                            if field.startswith('analytic_account_'
+                                    + str(account.root.id) + '.'):
                                 ham, field2 = field.split('.', 1)
                                 id2record[line.id][field] = account[field2]
         return res
 
     @classmethod
-    def create(cls, vals):
+    def create(cls, vlist):
         Selection = Pool().get('analytic_account.account.selection')
-        vals = vals.copy()
-        selection_vals = {}
-        for field in vals.keys():
-            if field.startswith('analytic_account_'):
-                if vals[field]:
-                    selection_vals.setdefault('accounts', [])
-                    selection_vals['accounts'].append(('add', [vals[field]]))
-                del vals[field]
-        if vals.get('analytic_accounts'):
-            Selection.write([Selection(vals['analytic_accounts'])],
-                selection_vals)
-        elif vals.get('type', 'line') == 'line':
-            selection = Selection.create(selection_vals)
-            vals['analytic_accounts'] = selection.id
-        return super(SaleLine, cls).create(vals)
+        vlist = [x.copy() for x in vlist]
+        for vals in vlist:
+            selection_vals = {}
+            for field in vals.keys():
+                if field.startswith('analytic_account_'):
+                    if vals[field]:
+                        selection_vals.setdefault('accounts', [])
+                        selection_vals['accounts'].append(('add',
+                                [vals[field]]))
+                    del vals[field]
+            if vals.get('analytic_accounts'):
+                Selection.write([Selection(vals['analytic_accounts'])],
+                    selection_vals)
+            elif vals.get('type', 'line') == 'line':
+                selection, = Selection.create([selection_vals])
+                vals['analytic_accounts'] = selection.id
+        return super(SaleLine, cls).create(vlist)
 
     @classmethod
     def write(cls, lines, vals):
@@ -124,7 +125,7 @@ class SaleLine:
                 if not line.analytic_accounts:
                     # Create missing selection
                     with Transaction().set_user(0):
-                        selection = Selection.create({})
+                        selection, = Selection.create([{}])
                     cls.write([line], {
                         'analytic_accounts': selection.id,
                         })
@@ -196,12 +197,12 @@ class Account:
         SaleLine._fields_view_get_cache.clear()
 
     @classmethod
-    def create(cls, vals):
+    def create(cls, vlist):
         SaleLine = Pool().get('sale.line')
-        account = super(Account, cls).create(vals)
+        accounts = super(Account, cls).create(vlist)
         # Restart the cache on the fields_view_get method of sale.line
         SaleLine._fields_view_get_cache.clear()
-        return account
+        return accounts
 
     @classmethod
     def write(cls, accounts, vals):
diff --git a/sale.xml b/sale.xml
index 0b878e8..5068a77 100644
--- a/sale.xml
+++ b/sale.xml
@@ -6,19 +6,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.ui.view" id="sale_line_view_form">
             <field name="model">sale.line</field>
             <field name="inherit" ref="sale.sale_line_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page/field[@name="amount"]"
-                        position="after">
-                        <group col="4" colspan="4" name="analytic_accounts">
-                            <field name="analytic_accounts"/>
-                        </group>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">sale_line_form</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index e16503c..e202d27 100644
--- a/setup.py
+++ b/setup.py
@@ -25,10 +25,10 @@ requires = []
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
-                (dep, major_version, minor_version, major_version,
-                    minor_version + 1))
+            (dep, major_version, minor_version, major_version,
+                minor_version + 1))
 requires.append('trytond >= %s.%s, < %s.%s' %
-        (major_version, minor_version, major_version, minor_version + 1))
+    (major_version, minor_version, major_version, minor_version + 1))
 
 setup(name='trytond_analytic_sale',
     version=info.get('version', '0.0.1'),
@@ -36,16 +36,16 @@ setup(name='trytond_analytic_sale',
     long_description=read('README'),
     author='Tryton',
     url='http://www.tryton.org/',
-    download_url="http://downloads.tryton.org/" + \
-        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+    download_url=("http://downloads.tryton.org/" +
+        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/'),
     package_dir={'trytond.modules.analytic_sale': '.'},
     packages=[
         'trytond.modules.analytic_sale',
         'trytond.modules.analytic_sale.tests',
         ],
     package_data={
-        'trytond.modules.analytic_sale': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+        'trytond.modules.analytic_sale': (info.get('xml', [])
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po']),
         },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/tryton.cfg b/tryton.cfg
index 45202aa..7eaeabd 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.8.0
 depends:
     analytic_account
     analytic_invoice
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index aed999c..805d878 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-sale
-Version: 2.6.1
+Version: 2.8.0
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
 Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.6/
+Download-URL: http://downloads.tryton.org/2.8/
 Description: trytond_analytic_sale
         =====================
         
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 514a5b9..1ea5ee9 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -27,4 +27,5 @@ trytond_analytic_sale.egg-info/dependency_links.txt
 trytond_analytic_sale.egg-info/entry_points.txt
 trytond_analytic_sale.egg-info/not-zip-safe
 trytond_analytic_sale.egg-info/requires.txt
-trytond_analytic_sale.egg-info/top_level.txt
\ No newline at end of file
+trytond_analytic_sale.egg-info/top_level.txt
+view/sale_line_form.xml
\ No newline at end of file
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 7d72ca7..b56a3be 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_analytic_account >= 2.6, < 2.7
-trytond_analytic_invoice >= 2.6, < 2.7
-trytond_sale >= 2.6, < 2.7
-trytond >= 2.6, < 2.7
\ No newline at end of file
+trytond_analytic_account >= 2.8, < 2.9
+trytond_analytic_invoice >= 2.8, < 2.9
+trytond_sale >= 2.8, < 2.9
+trytond >= 2.8, < 2.9
\ No newline at end of file
diff --git a/view/sale_line_form.xml b/view/sale_line_form.xml
new file mode 100644
index 0000000..4b4ef47
--- /dev/null
+++ b/view/sale_line_form.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath
+        expr="/form/notebook/page/field[@name='amount']"
+        position="after">
+        <group col="4" colspan="4" name="analytic_accounts">
+            <field name="analytic_accounts"/>
+        </group>
+    </xpath>
+</data>
commit 9b2c2101b5e18253b0bfddea991600ff24bc99be
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Fri Feb 15 20:50:35 2013 +0100

    Adding upstream version 2.6.1.

diff --git a/CHANGELOG b/CHANGELOG
index e70af61..39c1db7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.1 - 2012-12-23
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 70eb88a..6d94d43 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond_analytic_sale
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/sale.py b/sale.py
index 22c5328..f2b4793 100644
--- a/sale.py
+++ b/sale.py
@@ -96,7 +96,7 @@ class SaleLine:
             if field.startswith('analytic_account_'):
                 if vals[field]:
                     selection_vals.setdefault('accounts', [])
-                    selection_vals['accounts'].append(('add', vals[field]))
+                    selection_vals['accounts'].append(('add', [vals[field]]))
                 del vals[field]
         if vals.get('analytic_accounts'):
             Selection.write([Selection(vals['analytic_accounts'])],
diff --git a/tryton.cfg b/tryton.cfg
index 4663c61..45202aa 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.0
+version=2.6.1
 depends:
     analytic_account
     analytic_invoice
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index ae76585..aed999c 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 1.0
+Metadata-Version: 1.1
 Name: trytond-analytic-sale
-Version: 2.6.0
+Version: 2.6.1
 Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 8e182284a5028d0a55a2de025aa18d15a6ef0f67
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Oct 23 19:53:28 2012 +0200

    Adding upstream version 2.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index c3ffbfc..e70af61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,9 +1,6 @@
-Version 2.4.2 - 2012-09-02
+Version 2.6.0 - 2012-10-22
 * Bug fixes (see mercurial logs for details)
 
-Version 2.4.1 - 2012-04-24
-* Restore es_AR translation
-
 Version 2.4.0 - 2012-04-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 7f5d5fd..44969c7 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include TODO
 include COPYRIGHT
 include CHANGELOG
 include LICENSE
+include tryton.cfg
 include *.xml
 include *.odt
 include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index d64bf9a..70eb88a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,14 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 2.4.2
-Summary: Add analytic account on sale lines.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_sale
+        =====================
+        
+        The analytic_sale module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/README b/README
index f08a185..c297b1a 100644
--- a/README
+++ b/README
@@ -2,7 +2,6 @@ trytond_analytic_sale
 =====================
 
 The analytic_sale module of the Tryton application platform.
-See __tryton__.py
 
 Installing
 ----------
diff --git a/__init__.py b/__init__.py
index b083dc8..d08bd56 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,12 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
+from trytond.pool import Pool
 from .sale import *
+
+
+def register():
+    Pool.register(
+        SaleLine,
+        Account,
+        module='analytic_sale', type_='model')
diff --git a/__tryton__.py b/__tryton__.py
deleted file mode 100644
index 6cf0338..0000000
--- a/__tryton__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of
-#this repository contains the full copyright notices and license terms.
-{
-    'name': 'Analytic Sale',
-    'name_bg_BG': 'Аналитична продажба',
-    'name_ca_ES': 'Venda analítica',
-    'name_de_DE': 'Kostenstellen Verkauf',
-    'name_es_AR': 'Venta Analítica',
-    'name_es_CO': 'Ventas Analíticas',
-    'name_es_ES': 'Venta analítica',
-    'name_fr_FR': 'Vente analytique',
-    'version': '2.4.2',
-    'author': 'B2CK',
-    'email': 'info at b2ck.com',
-    'website': 'http://www.tryton.org/',
-    'description': '''Add analytic account on sale lines.
-''',
-    'description_bg_BG': '''Добавя аналитична сметка към редове от продажба
-''',
-    'description_ca_ES': '''Afegeix comptabilitat analítica a les línies de les
-comandes de venda.''',
-    'description_de_DE': '''Fügt Kostenstellen zu den Verkaufspositionen hinzu
-''',
-    'description_es_AR': '''Añade contabilidad analítica a las líneas de venta.
-''',
-    'description_es_CO': '''Añade cuentas analíticas a las líneas de ventas.
-''',
-    'description_es_ES': '''Añade contabilidad analítica a las líneas de los
-pedidos de venta.''',
-    'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
-    'depends': [
-        'sale',
-        'analytic_account',
-        'analytic_invoice',
-    ],
-    'xml': [
-        'sale.xml',
-    ],
-    'translation': [
-        'locale/bg_BG.po',
-        'locale/ca_ES.po',
-        'locale/cs_CZ.po',
-        'locale/de_DE.po',
-        'locale/es_AR.po',
-        'locale/es_CO.po',
-        'locale/es_ES.po',
-        'locale/fr_FR.po',
-        'locale/nl_NL.po',
-        'locale/ru_RU.po',
-    ],
-}
diff --git a/sale.py b/sale.py
index 396e02d..22c5328 100644
--- a/sale.py
+++ b/sale.py
@@ -1,14 +1,16 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from trytond.model import ModelView, ModelSQL, fields
+from trytond.model import fields
 from trytond.pyson import Eval
 from trytond.transaction import Transaction
-from trytond.pool import Pool
+from trytond.pool import Pool, PoolMeta
 
+__all__ = ['SaleLine', 'Account']
+__metaclass__ = PoolMeta
 
-class SaleLine(ModelSQL, ModelView):
-    _name = 'sale.line'
 
+class SaleLine:
+    __name__ = 'sale.line'
     analytic_accounts = fields.Many2One('analytic_account.account.selection',
         'Analytic Accounts',
         states={
@@ -16,47 +18,46 @@ class SaleLine(ModelSQL, ModelView):
             },
         depends=['type'])
 
-    def _view_look_dom_arch(self, tree, type, field_children=None):
-        analytic_account_obj = Pool().get('analytic_account.account')
-        analytic_account_obj.convert_view(tree)
-        arch, fields, = super(SaleLine, self)._view_look_dom_arch(tree, type,
+    @classmethod
+    def _view_look_dom_arch(cls, tree, type, field_children=None):
+        AnalyticAccount = Pool().get('analytic_account.account')
+        AnalyticAccount.convert_view(tree)
+        arch, fields, = super(SaleLine, cls)._view_look_dom_arch(tree, type,
             field_children=field_children)
         return arch, fields
 
-    def fields_get(self, fields_names=None):
-        analytic_account_obj = Pool().get('analytic_account.account')
+    @classmethod
+    def fields_get(cls, fields_names=None):
+        AnalyticAccount = Pool().get('analytic_account.account')
 
-        res = super(SaleLine, self).fields_get(fields_names)
+        res = super(SaleLine, cls).fields_get(fields_names)
 
-        analytic_accounts_field = super(SaleLine, self).fields_get(
+        analytic_accounts_field = super(SaleLine, cls).fields_get(
                 ['analytic_accounts'])['analytic_accounts']
 
-        res.update(analytic_account_obj.analytic_accounts_fields_get(
+        res.update(AnalyticAccount.analytic_accounts_fields_get(
                 analytic_accounts_field, fields_names))
         return res
 
-    def default_get(self, fields, with_rec_name=True):
+    @classmethod
+    def default_get(cls, fields, with_rec_name=True):
         fields = [x for x in fields if not x.startswith('analytic_account_')]
-        return super(SaleLine, self).default_get(fields,
+        return super(SaleLine, cls).default_get(fields,
             with_rec_name=with_rec_name)
 
-    def read(self, ids, fields_names=None):
-        int_id = False
-        if isinstance(ids, (int, long)):
-            int_id = True
-            ids = [ids]
-
+    @classmethod
+    def read(cls, ids, fields_names=None):
         if fields_names:
             fields_names2 = [x for x in fields_names
                     if not x.startswith('analytic_account_')]
         else:
             fields_names2 = fields_names
 
-        res = super(SaleLine, self).read(ids, fields_names=fields_names2)
+        res = super(SaleLine, cls).read(ids, fields_names=fields_names2)
 
         if not fields_names:
-            fields_names = list(set(self._columns.keys() \
-                    + self._inherit_fields.keys()))
+            fields_names = list(set(cls._fields.keys()
+                    + cls._inherit_fields.keys()))
 
         root_ids = []
         for field in fields_names:
@@ -66,7 +67,7 @@ class SaleLine(ModelSQL, ModelView):
             id2record = {}
             for record in res:
                 id2record[record['id']] = record
-            lines = self.browse(ids)
+            lines = cls.browse(ids)
             for line in lines:
                 for root_id in root_ids:
                     id2record[line.id]['analytic_account_' \
@@ -84,12 +85,11 @@ class SaleLine(ModelSQL, ModelView):
                                     str(account.root.id) + '.'):
                                 ham, field2 = field.split('.', 1)
                                 id2record[line.id][field] = account[field2]
-        if int_id:
-            return res[0]
         return res
 
-    def create(self, vals):
-        selection_obj = Pool().get('analytic_account.account.selection')
+    @classmethod
+    def create(cls, vals):
+        Selection = Pool().get('analytic_account.account.selection')
         vals = vals.copy()
         selection_vals = {}
         for field in vals.keys():
@@ -99,17 +99,17 @@ class SaleLine(ModelSQL, ModelView):
                     selection_vals['accounts'].append(('add', vals[field]))
                 del vals[field]
         if vals.get('analytic_accounts'):
-            selection_obj.write(vals['analytic_accounts'], selection_vals)
+            Selection.write([Selection(vals['analytic_accounts'])],
+                selection_vals)
         elif vals.get('type', 'line') == 'line':
-            selection_id = selection_obj.create(selection_vals)
-            vals['analytic_accounts'] = selection_id
-        return super(SaleLine, self).create(vals)
+            selection = Selection.create(selection_vals)
+            vals['analytic_accounts'] = selection.id
+        return super(SaleLine, cls).create(vals)
 
-    def write(self, ids, vals):
-        selection_obj = Pool().get('analytic_account.account.selection')
+    @classmethod
+    def write(cls, lines, vals):
+        Selection = Pool().get('analytic_account.account.selection')
         vals = vals.copy()
-        if isinstance(ids, (int, long)):
-            ids = [ids]
         selection_vals = {}
         for field in vals.keys():
             if field.startswith('analytic_account_'):
@@ -117,7 +117,6 @@ class SaleLine(ModelSQL, ModelView):
                 selection_vals[root_id] = vals[field]
                 del vals[field]
         if selection_vals:
-            lines = self.browse(ids)
             for line in lines:
                 if line.type != 'line':
                     continue
@@ -125,11 +124,10 @@ class SaleLine(ModelSQL, ModelView):
                 if not line.analytic_accounts:
                     # Create missing selection
                     with Transaction().set_user(0):
-                        selection_id = selection_obj.create({})
-                    self.write(line.id, {
-                        'analytic_accounts': selection_id,
+                        selection = Selection.create({})
+                    cls.write([line], {
+                        'analytic_accounts': selection.id,
                         })
-                    line = self.browse(line.id)
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in selection_vals:
                         value = selection_vals[account.root.id]
@@ -141,88 +139,73 @@ class SaleLine(ModelSQL, ModelView):
                     if account_id \
                             and account_id not in accounts:
                         accounts.append(account_id)
-                selection_obj.write(line.analytic_accounts.id, {
+                Selection.write([line.analytic_accounts], {
                     'accounts': [('set', accounts)],
                     })
-        return super(SaleLine, self).write(ids, vals)
+        return super(SaleLine, cls).write(lines, vals)
 
-    def delete(self, ids):
-        selection_obj = Pool().get('analytic_account.account.selection')
+    @classmethod
+    def delete(cls, lines):
+        Selection = Pool().get('analytic_account.account.selection')
 
-        if isinstance(ids, (int, long)):
-            ids = [ids]
-        selection_ids = []
-        lines = self.browse(ids)
+        selections = []
         for line in lines:
             if line.analytic_accounts:
-                selection_ids.append(line.analytic_accounts.id)
-
-        res = super(SaleLine, self).delete(ids)
-        selection_obj.delete(selection_ids)
-        return res
+                selections.append(line.analytic_accounts)
 
-    def copy(self, ids, default=None):
-        selection_obj = Pool().get('analytic_account.account.selection')
+        super(SaleLine, cls).delete(lines)
+        Selection.delete(selections)
 
-        new_ids = super(SaleLine, self).copy(ids, default=default)
+    @classmethod
+    def copy(cls, lines, default=None):
+        Selection = Pool().get('analytic_account.account.selection')
 
-        int_id = False
-        if isinstance(new_ids, (int, long)):
-            int_id = True
-            new_ids = [new_ids]
+        new_lines = super(SaleLine, cls).copy(lines, default=default)
 
-        for line in self.browse(new_ids):
+        for line in new_lines:
             if line.analytic_accounts:
-                selection_id = selection_obj.copy(line.analytic_accounts.id)
-                self.write(line.id, {
-                    'analytic_accounts': selection_id,
+                selection, = Selection.copy([line.analytic_accounts])
+                cls.write([line], {
+                    'analytic_accounts': selection.id,
                     })
+        return new_lines
 
-        if int_id:
-            return new_ids[0]
-        return new_ids
-
-    def get_invoice_line(self, line, invoice_type):
-        pool = Pool()
-        account_selection_obj = pool.get('analytic_account.account.selection')
-
-        res = super(SaleLine, self).get_invoice_line(line, invoice_type)
-        if not res:
-            return res
+    def get_invoice_line(self, invoice_type):
+        AccountSelection = Pool().get('analytic_account.account.selection')
 
-        selection_id = False
-        if line.analytic_accounts:
-            selection_id = account_selection_obj.copy(
-                line.analytic_accounts.id)
-        for vals in res:
-            vals['analytic_accounts'] = selection_id
-        return res
+        invoice_lines = super(SaleLine, self).get_invoice_line(invoice_type)
+        if not invoice_lines:
+            return invoice_lines
 
-SaleLine()
+        selection = None
+        if self.analytic_accounts:
+            selection, = AccountSelection.copy([self.analytic_accounts])
+        for invoice_line in invoice_lines:
+            invoice_line.analytic_accounts = selection
+        return invoice_lines
 
 
-class Account(ModelSQL, ModelView):
-    _name = 'analytic_account.account'
+class Account:
+    __name__ = 'analytic_account.account'
 
-    def delete(self, ids):
-        sale_line_obj = Pool().get('sale.line')
-        res = super(Account, self).delete(ids)
+    @classmethod
+    def delete(cls, accounts):
+        SaleLine = Pool().get('sale.line')
+        super(Account, cls).delete(accounts)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get.reset()
-        return res
+        SaleLine._fields_view_get_cache.clear()
 
-    def create(self, vals):
-        sale_line_obj = Pool().get('sale.line')
-        res = super(Account, self).create(vals)
+    @classmethod
+    def create(cls, vals):
+        SaleLine = Pool().get('sale.line')
+        account = super(Account, cls).create(vals)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get.reset()
-        return res
+        SaleLine._fields_view_get_cache.clear()
+        return account
 
-    def write(self, ids, vals):
-        sale_line_obj = Pool().get('sale.line')
-        res = super(Account, self).write(ids, vals)
+    @classmethod
+    def write(cls, accounts, vals):
+        SaleLine = Pool().get('sale.line')
+        super(Account, cls).write(accounts, vals)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get.reset()
-        return res
-
-Account()
+        SaleLine._fields_view_get_cache.clear()
diff --git a/setup.py b/setup.py
index ae3cee5..e16503c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,8 +4,19 @@
 
 from setuptools import setup
 import re
+import os
+import ConfigParser
 
-info = eval(open('__tryton__.py').read())
+
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+config = ConfigParser.ConfigParser()
+config.readfp(open('tryton.cfg'))
+info = dict(config.items('tryton'))
+for key in ('depends', 'extras_depend', 'xml'):
+    if key in info:
+        info[key] = info[key].strip().splitlines()
 major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 major_version = int(major_version)
 minor_version = int(minor_version)
@@ -21,21 +32,21 @@ requires.append('trytond >= %s.%s, < %s.%s' %
 
 setup(name='trytond_analytic_sale',
     version=info.get('version', '0.0.1'),
-    description=info.get('description', ''),
-    author=info.get('author', ''),
-    author_email=info.get('email', ''),
-    url=info.get('website', ''),
+    description='Tryton module to add analytic accounting on sale',
+    long_description=read('README'),
+    author='Tryton',
+    url='http://www.tryton.org/',
     download_url="http://downloads.tryton.org/" + \
-            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
+        info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
     package_dir={'trytond.modules.analytic_sale': '.'},
     packages=[
         'trytond.modules.analytic_sale',
         'trytond.modules.analytic_sale.tests',
-    ],
+        ],
     package_data={
         'trytond.modules.analytic_sale': info.get('xml', []) \
-                + info.get('translation', []),
-    },
+            + ['tryton.cfg', 'locale/*.po'],
+        },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
@@ -57,7 +68,7 @@ setup(name='trytond_analytic_sale',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
         'Topic :: Office/Business :: Financial :: Accounting',
-    ],
+        ],
     license='GPL-3',
     install_requires=requires,
     zip_safe=False,
@@ -67,4 +78,4 @@ setup(name='trytond_analytic_sale',
     """,
     test_suite='tests',
     test_loader='trytond.test_loader:Loader',
-)
+    )
diff --git a/tryton.cfg b/tryton.cfg
new file mode 100644
index 0000000..4663c61
--- /dev/null
+++ b/tryton.cfg
@@ -0,0 +1,8 @@
+[tryton]
+version=2.6.0
+depends:
+    analytic_account
+    analytic_invoice
+    sale
+xml:
+    sale.xml
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index e409685..ae76585 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,14 +1,48 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 2.4.2
-Summary: Add analytic account on sale lines.
-
+Version: 2.6.0
+Summary: Tryton module to add analytic accounting on sale
 Home-page: http://www.tryton.org/
-Author: B2CK
-Author-email: info at b2ck.com
+Author: Tryton
+Author-email: UNKNOWN
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.4/
-Description: UNKNOWN
+Download-URL: http://downloads.tryton.org/2.6/
+Description: trytond_analytic_sale
+        =====================
+        
+        The analytic_sale module of the Tryton application platform.
+        
+        Installing
+        ----------
+        
+        See INSTALL
+        
+        Support
+        -------
+        
+        If you encounter any problems with Tryton, please don't hesitate to ask
+        questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+        
+          http://bugs.tryton.org/
+          http://groups.tryton.org/
+          http://wiki.tryton.org/
+          irc://irc.freenode.net/tryton
+        
+        License
+        -------
+        
+        See LICENSE
+        
+        Copyright
+        ---------
+        
+        See COPYRIGHT
+        
+        
+        For more information please visit the Tryton web site:
+        
+          http://www.tryton.org/
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 3b040d1..514a5b9 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -6,8 +6,8 @@ MANIFEST.in
 README
 sale.xml
 setup.py
+tryton.cfg
 ./__init__.py
-./__tryton__.py
 ./sale.py
 ./tests/__init__.py
 ./tests/test_analytic_sale.py
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 7a4881d..7d72ca7 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_sale >= 2.4, < 2.5
-trytond_analytic_account >= 2.4, < 2.5
-trytond_analytic_invoice >= 2.4, < 2.5
-trytond >= 2.4, < 2.5
\ No newline at end of file
+trytond_analytic_account >= 2.6, < 2.7
+trytond_analytic_invoice >= 2.6, < 2.7
+trytond_sale >= 2.6, < 2.7
+trytond >= 2.6, < 2.7
\ No newline at end of file
commit 29a6d2790a03c5d82d389a0fa5250612f121b059
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Sep 11 13:25:49 2012 +0200

    Adding upstream version 2.4.2.

diff --git a/CHANGELOG b/CHANGELOG
index dc330ba..c3ffbfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.2 - 2012-09-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.4.1 - 2012-04-24
 * Restore es_AR translation
 
diff --git a/PKG-INFO b/PKG-INFO
index 0fcd152..d64bf9a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 2.4.1
+Version: 2.4.2
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index da9bb4d..6cf0338 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '2.4.1',
+    'version': '2.4.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/sale.py b/sale.py
index e53f19a..396e02d 100644
--- a/sale.py
+++ b/sale.py
@@ -182,11 +182,11 @@ class SaleLine(ModelSQL, ModelView):
             return new_ids[0]
         return new_ids
 
-    def get_invoice_line(self, line):
+    def get_invoice_line(self, line, invoice_type):
         pool = Pool()
         account_selection_obj = pool.get('analytic_account.account.selection')
 
-        res = super(SaleLine, self).get_invoice_line(line)
+        res = super(SaleLine, self).get_invoice_line(line, invoice_type)
         if not res:
             return res
 
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 4e92943..e409685 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 2.4.1
+Version: 2.4.2
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
commit 3793ffd351f9549970461c7965e919a45545ac54
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 25 11:03:29 2012 +0200

    Adding upstream version 2.4.1.

diff --git a/CHANGELOG b/CHANGELOG
index 875c8bf..dc330ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.1 - 2012-04-24
+* Restore es_AR translation
+
 Version 2.4.0 - 2012-04-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index adf74f9..0fcd152 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 2.4.0
+Version: 2.4.1
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index c1de2f8..da9bb4d 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -9,7 +9,7 @@
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '2.4.0',
+    'version': '2.4.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/locale/es_AR.po b/locale/es_AR.po
index 542f292..6c5db27 100644
--- a/locale/es_AR.po
+++ b/locale/es_AR.po
@@ -1,3 +1,7 @@
 # 
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 88c9c4c..4e92943 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 2.4.0
+Version: 2.4.1
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
commit 053f443d593f5129f9b9111eaf60b40cda1a6ff4
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue Apr 24 19:30:38 2012 +0200

    Adding upstream version 2.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index 905eea5..875c8bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.4.0 - 2012-04-23
+* Bug fixes (see mercurial logs for details)
+
 Version 2.2.0 - 2011-10-24
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 3d2324b..26f578f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2012 Cédric Krier.
 Copyright (C) 2008-2011 Bertrand Chenal.
-Copyright (C) 2008-2011 B2CK SPRL.
+Copyright (C) 2008-2012 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/INSTALL b/INSTALL
index 4a428f6..fac5369 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_sale
 Prerequisites
 -------------
 
- * Python 2.5 or later (http://www.python.org/)
+ * Python 2.6 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_sale (http://www.tryton.org/)
  * trytond_analytic_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 3094033..adf74f9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 2.2.0
+Version: 2.4.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 3c25009..b083dc8 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from sale import *
+from .sale import *
diff --git a/__tryton__.py b/__tryton__.py
index 7004b8e..c1de2f8 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,11 +3,13 @@
 {
     'name': 'Analytic Sale',
     'name_bg_BG': 'Аналитична продажба',
+    'name_ca_ES': 'Venda analítica',
     'name_de_DE': 'Kostenstellen Verkauf',
+    'name_es_AR': 'Venta Analítica',
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '2.2.0',
+    'version': '2.4.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -15,11 +17,16 @@
 ''',
     'description_bg_BG': '''Добавя аналитична сметка към редове от продажба
 ''',
+    'description_ca_ES': '''Afegeix comptabilitat analítica a les línies de les
+comandes de venda.''',
     'description_de_DE': '''Fügt Kostenstellen zu den Verkaufspositionen hinzu
 ''',
+    'description_es_AR': '''Añade contabilidad analítica a las líneas de venta.
+''',
     'description_es_CO': '''Añade cuentas analíticas a las líneas de ventas.
 ''',
-    'description_es_ES': 'Añade contabilidad analítica a las líneas de venta.',
+    'description_es_ES': '''Añade contabilidad analítica a las líneas de los
+pedidos de venta.''',
     'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
     'depends': [
         'sale',
@@ -31,8 +38,10 @@
     ],
     'translation': [
         'locale/bg_BG.po',
+        'locale/ca_ES.po',
         'locale/cs_CZ.po',
         'locale/de_DE.po',
+        'locale/es_AR.po',
         'locale/es_CO.po',
         'locale/es_ES.po',
         'locale/fr_FR.po',
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
index 3107d97..6bbeda9 100644
--- a/locale/bg_BG.po
+++ b/locale/bg_BG.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr "Аналитични сметки"
diff --git a/locale/nl_NL.po b/locale/ca_ES.po
similarity index 55%
copy from locale/nl_NL.po
copy to locale/ca_ES.po
index 4fa5902..bb25bd3 100644
--- a/locale/nl_NL.po
+++ b/locale/ca_ES.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
-msgstr ""
+msgstr "Comptes analítics"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
index 4fa5902..518fc49 100644
--- a/locale/cs_CZ.po
+++ b/locale/cs_CZ.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 900b8cf..55113f7 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr "Kostenstellen"
diff --git a/locale/es_AR.po b/locale/es_AR.po
new file mode 100644
index 0000000..542f292
--- /dev/null
+++ b/locale/es_AR.po
@@ -0,0 +1,3 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
diff --git a/locale/es_CO.po b/locale/es_CO.po
index c436059..81105f9 100644
--- a/locale/es_CO.po
+++ b/locale/es_CO.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr "Cuentas Analíticas"
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 1525e98..6c5db27 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr "Cuentas analíticas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 2f6ff13..6ad96cc 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
index 4fa5902..518fc49 100644
--- a/locale/nl_NL.po
+++ b/locale/nl_NL.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
index 4fa5902..518fc49 100644
--- a/locale/ru_RU.po
+++ b/locale/ru_RU.po
@@ -2,6 +2,6 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=utf-8\n"
 
-msgctxt "field:sale.line,analytic_accounts:0"
+msgctxt "field:sale.line,analytic_accounts:"
 msgid "Analytic Accounts"
 msgstr ""
diff --git a/sale.py b/sale.py
index d67023e..e53f19a 100644
--- a/sale.py
+++ b/sale.py
@@ -41,8 +41,6 @@ class SaleLine(ModelSQL, ModelView):
             with_rec_name=with_rec_name)
 
     def read(self, ids, fields_names=None):
-        selection_obj = Pool().get('analytic_account.account.selection')
-
         int_id = False
         if isinstance(ids, (int, long)):
             int_id = True
@@ -72,7 +70,7 @@ class SaleLine(ModelSQL, ModelView):
             for line in lines:
                 for root_id in root_ids:
                     id2record[line.id]['analytic_account_' \
-                            + str(root_id)] = False
+                            + str(root_id)] = None
                 if line.type != 'line':
                     continue
                 if not line.analytic_accounts:
@@ -185,7 +183,8 @@ class SaleLine(ModelSQL, ModelView):
         return new_ids
 
     def get_invoice_line(self, line):
-        account_selection_obj = Pool().get('analytic_account.account.selection')
+        pool = Pool()
+        account_selection_obj = pool.get('analytic_account.account.selection')
 
         res = super(SaleLine, self).get_invoice_line(line)
         if not res:
@@ -193,7 +192,8 @@ class SaleLine(ModelSQL, ModelView):
 
         selection_id = False
         if line.analytic_accounts:
-            selection_id = account_selection_obj.copy(line.analytic_accounts.id)
+            selection_id = account_selection_obj.copy(
+                line.analytic_accounts.id)
         for vals in res:
             vals['analytic_accounts'] = selection_id
         return res
diff --git a/setup.py b/setup.py
index 8abdb7f..ae3cee5 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ minor_version = int(minor_version)
 
 requires = []
 for dep in info.get('depends', []):
-    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+    if not re.match(r'(ir|res|webdav)(\W|$)', dep):
         requires.append('trytond_%s >= %s.%s, < %s.%s' %
                 (dep, major_version, minor_version, major_version,
                     minor_version + 1))
diff --git a/tests/__init__.py b/tests/__init__.py
index 84d3729..82d80c4 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_analytic_sale import suite
+from .test_analytic_sale import suite
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
index 4d434b5..bda6d52 100644
--- a/tests/test_analytic_sale.py
+++ b/tests/test_analytic_sale.py
@@ -2,7 +2,8 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-import sys, os
+import sys
+import os
 DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
     '..', '..', '..', '..', '..', 'trytond')))
 if os.path.isdir(DIR):
@@ -33,6 +34,7 @@ class AnalyticSaleTestCase(unittest.TestCase):
         '''
         test_depends()
 
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 129200f..88c9c4c 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 2.2.0
+Version: 2.4.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.2/
+Download-URL: http://downloads.tryton.org/2.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 2c4195a..3b040d1 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -12,8 +12,10 @@ setup.py
 ./tests/__init__.py
 ./tests/test_analytic_sale.py
 locale/bg_BG.po
+locale/ca_ES.po
 locale/cs_CZ.po
 locale/de_DE.po
+locale/es_AR.po
 locale/es_CO.po
 locale/es_ES.po
 locale/fr_FR.po
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 4060225..7a4881d 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_sale >= 2.2, < 2.3
-trytond_analytic_account >= 2.2, < 2.3
-trytond_analytic_invoice >= 2.2, < 2.3
-trytond >= 2.2, < 2.3
\ No newline at end of file
+trytond_sale >= 2.4, < 2.5
+trytond_analytic_account >= 2.4, < 2.5
+trytond_analytic_invoice >= 2.4, < 2.5
+trytond >= 2.4, < 2.5
\ No newline at end of file
commit 922dcc0ed4f1f268cccdef138a92fdbf99dde360
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Oct 31 16:20:33 2011 +0100

    Adding upstream version 2.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index f74f0b3..905eea5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.2.0 - 2011-10-24
+* Bug fixes (see mercurial logs for details)
+
 Version 2.0.0 - 2011-04-27
 * Bug fixes (see mercurial logs for details)
 
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..7f5d5fd 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,4 +6,4 @@ include CHANGELOG
 include LICENSE
 include *.xml
 include *.odt
-include *.csv
+include locale/*.po
diff --git a/PKG-INFO b/PKG-INFO
index 06f33aa..3094033 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,28 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 2.0.0
+Version: 2.2.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/__tryton__.py b/__tryton__.py
index 05765e2..7004b8e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -7,7 +7,7 @@
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '2.0.0',
+    'version': '2.2.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -30,10 +30,13 @@
         'sale.xml',
     ],
     'translation': [
-        'bg_BG.csv',
-        'de_DE.csv',
-        'es_CO.csv',
-        'es_ES.csv',
-        'fr_FR.csv',
+        'locale/bg_BG.po',
+        'locale/cs_CZ.po',
+        'locale/de_DE.po',
+        'locale/es_CO.po',
+        'locale/es_ES.po',
+        'locale/fr_FR.po',
+        'locale/nl_NL.po',
+        'locale/ru_RU.po',
     ],
 }
diff --git a/bg_BG.csv b/bg_BG.csv
deleted file mode 100644
index 0d2a361..0000000
--- a/bg_BG.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/de_DE.csv b/de_DE.csv
deleted file mode 100644
index ebf4693..0000000
--- a/de_DE.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_CO.csv b/es_CO.csv
deleted file mode 100644
index 6f27e45..0000000
--- a/es_CO.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
diff --git a/es_ES.csv b/es_ES.csv
deleted file mode 100644
index bf923cd..0000000
--- a/es_ES.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
diff --git a/fr_FR.csv b/fr_FR.csv
deleted file mode 100644
index c95c438..0000000
--- a/fr_FR.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/locale/bg_BG.po b/locale/bg_BG.po
new file mode 100644
index 0000000..3107d97
--- /dev/null
+++ b/locale/bg_BG.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Аналитични сметки"
diff --git a/locale/cs_CZ.po b/locale/cs_CZ.po
new file mode 100644
index 0000000..4fa5902
--- /dev/null
+++ b/locale/cs_CZ.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/de_DE.po b/locale/de_DE.po
new file mode 100644
index 0000000..900b8cf
--- /dev/null
+++ b/locale/de_DE.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Kostenstellen"
diff --git a/locale/es_CO.po b/locale/es_CO.po
new file mode 100644
index 0000000..c436059
--- /dev/null
+++ b/locale/es_CO.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas Analíticas"
diff --git a/locale/es_ES.po b/locale/es_ES.po
new file mode 100644
index 0000000..1525e98
--- /dev/null
+++ b/locale/es_ES.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Cuentas analíticas"
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
new file mode 100644
index 0000000..2f6ff13
--- /dev/null
+++ b/locale/fr_FR.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr "Comptes analytiques"
diff --git a/locale/nl_NL.po b/locale/nl_NL.po
new file mode 100644
index 0000000..4fa5902
--- /dev/null
+++ b/locale/nl_NL.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/locale/ru_RU.po b/locale/ru_RU.po
new file mode 100644
index 0000000..4fa5902
--- /dev/null
+++ b/locale/ru_RU.po
@@ -0,0 +1,7 @@
+# 
+msgid ""
+msgstr "Content-Type: text/plain; charset=utf-8\n"
+
+msgctxt "field:sale.line,analytic_accounts:0"
+msgid "Analytic Accounts"
+msgstr ""
diff --git a/sale.py b/sale.py
index 52bc1bf..d67023e 100644
--- a/sale.py
+++ b/sale.py
@@ -1,29 +1,30 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-from __future__ import with_statement
 from trytond.model import ModelView, ModelSQL, fields
-from trytond.pyson import Not, Equal, Eval
+from trytond.pyson import Eval
 from trytond.transaction import Transaction
+from trytond.pool import Pool
 
 
 class SaleLine(ModelSQL, ModelView):
     _name = 'sale.line'
 
     analytic_accounts = fields.Many2One('analytic_account.account.selection',
-            'Analytic Accounts',
-            states={
-                'invisible': Not(Equal(Eval('type'), 'line')),
-            })
+        'Analytic Accounts',
+        states={
+            'invisible': Eval('type') != 'line',
+            },
+        depends=['type'])
 
     def _view_look_dom_arch(self, tree, type, field_children=None):
-        analytic_account_obj = self.pool.get('analytic_account.account')
+        analytic_account_obj = Pool().get('analytic_account.account')
         analytic_account_obj.convert_view(tree)
         arch, fields, = super(SaleLine, self)._view_look_dom_arch(tree, type,
             field_children=field_children)
         return arch, fields
 
     def fields_get(self, fields_names=None):
-        analytic_account_obj = self.pool.get('analytic_account.account')
+        analytic_account_obj = Pool().get('analytic_account.account')
 
         res = super(SaleLine, self).fields_get(fields_names)
 
@@ -34,8 +35,13 @@ class SaleLine(ModelSQL, ModelView):
                 analytic_accounts_field, fields_names))
         return res
 
+    def default_get(self, fields, with_rec_name=True):
+        fields = [x for x in fields if not x.startswith('analytic_account_')]
+        return super(SaleLine, self).default_get(fields,
+            with_rec_name=with_rec_name)
+
     def read(self, ids, fields_names=None):
-        selection_obj = self.pool.get('analytic_account.account.selection')
+        selection_obj = Pool().get('analytic_account.account.selection')
 
         int_id = False
         if isinstance(ids, (int, long)):
@@ -85,7 +91,7 @@ class SaleLine(ModelSQL, ModelView):
         return res
 
     def create(self, vals):
-        selection_obj = self.pool.get('analytic_account.account.selection')
+        selection_obj = Pool().get('analytic_account.account.selection')
         vals = vals.copy()
         selection_vals = {}
         for field in vals.keys():
@@ -102,7 +108,7 @@ class SaleLine(ModelSQL, ModelView):
         return super(SaleLine, self).create(vals)
 
     def write(self, ids, vals):
-        selection_obj = self.pool.get('analytic_account.account.selection')
+        selection_obj = Pool().get('analytic_account.account.selection')
         vals = vals.copy()
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -143,7 +149,7 @@ class SaleLine(ModelSQL, ModelView):
         return super(SaleLine, self).write(ids, vals)
 
     def delete(self, ids):
-        selection_obj = self.pool.get('analytic_account.account.selection')
+        selection_obj = Pool().get('analytic_account.account.selection')
 
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -158,7 +164,7 @@ class SaleLine(ModelSQL, ModelView):
         return res
 
     def copy(self, ids, default=None):
-        selection_obj = self.pool.get('analytic_account.account.selection')
+        selection_obj = Pool().get('analytic_account.account.selection')
 
         new_ids = super(SaleLine, self).copy(ids, default=default)
 
@@ -179,7 +185,7 @@ class SaleLine(ModelSQL, ModelView):
         return new_ids
 
     def get_invoice_line(self, line):
-        account_selection_obj = self.pool.get('analytic_account.account.selection')
+        account_selection_obj = Pool().get('analytic_account.account.selection')
 
         res = super(SaleLine, self).get_invoice_line(line)
         if not res:
@@ -199,21 +205,21 @@ class Account(ModelSQL, ModelView):
     _name = 'analytic_account.account'
 
     def delete(self, ids):
-        sale_line_obj = self.pool.get('sale.line')
+        sale_line_obj = Pool().get('sale.line')
         res = super(Account, self).delete(ids)
         # Restart the cache on the fields_view_get method of sale.line
         sale_line_obj.fields_view_get.reset()
         return res
 
     def create(self, vals):
-        sale_line_obj = self.pool.get('sale.line')
+        sale_line_obj = Pool().get('sale.line')
         res = super(Account, self).create(vals)
         # Restart the cache on the fields_view_get method of sale.line
         sale_line_obj.fields_view_get.reset()
         return res
 
     def write(self, ids, vals):
-        sale_line_obj = self.pool.get('sale.line')
+        sale_line_obj = Pool().get('sale.line')
         res = super(Account, self).write(ids, vals)
         # Restart the cache on the fields_view_get method of sale.line
         sale_line_obj.fields_view_get.reset()
diff --git a/setup.py b/setup.py
index f290577..8abdb7f 100644
--- a/setup.py
+++ b/setup.py
@@ -39,17 +39,20 @@ setup(name='trytond_analytic_sale',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Plugins',
+        'Framework :: Tryton',
         'Intended Audience :: Developers',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'License :: OSI Approved :: GNU General Public License (GPL)',
         'Natural Language :: Bulgarian',
+        'Natural Language :: Czech',
+        'Natural Language :: Dutch',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
+        'Natural Language :: Russian',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2.5',
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
index e0edc8e..4d434b5 100644
--- a/tests/test_analytic_sale.py
+++ b/tests/test_analytic_sale.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import test_view
+from trytond.tests.test_tryton import test_view, test_depends
 
 
 class AnalyticSaleTestCase(unittest.TestCase):
@@ -27,6 +27,12 @@ class AnalyticSaleTestCase(unittest.TestCase):
         '''
         test_view('analytic_sale')
 
+    def test0006depends(self):
+        '''
+        Test depends.
+        '''
+        test_depends()
+
 def suite():
     suite = trytond.tests.test_tryton.suite()
     suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 760a624..129200f 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,28 +1,31 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 2.0.0
+Version: 2.2.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/2.0/
+Download-URL: http://downloads.tryton.org/2.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Plugins
+Classifier: Framework :: Tryton
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
 Classifier: Natural Language :: Bulgarian
+Classifier: Natural Language :: Czech
+Classifier: Natural Language :: Dutch
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
+Classifier: Natural Language :: Russian
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 2.5
 Classifier: Programming Language :: Python :: 2.6
 Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 3658e53..2c4195a 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -4,11 +4,6 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
-bg_BG.csv
-de_DE.csv
-es_CO.csv
-es_ES.csv
-fr_FR.csv
 sale.xml
 setup.py
 ./__init__.py
@@ -16,6 +11,14 @@ setup.py
 ./sale.py
 ./tests/__init__.py
 ./tests/test_analytic_sale.py
+locale/bg_BG.po
+locale/cs_CZ.po
+locale/de_DE.po
+locale/es_CO.po
+locale/es_ES.po
+locale/fr_FR.po
+locale/nl_NL.po
+locale/ru_RU.po
 trytond_analytic_sale.egg-info/PKG-INFO
 trytond_analytic_sale.egg-info/SOURCES.txt
 trytond_analytic_sale.egg-info/dependency_links.txt
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 889b1ec..4060225 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_sale >= 2.0, < 2.1
-trytond_analytic_account >= 2.0, < 2.1
-trytond_analytic_invoice >= 2.0, < 2.1
-trytond >= 2.0, < 2.1
\ No newline at end of file
+trytond_sale >= 2.2, < 2.3
+trytond_analytic_account >= 2.2, < 2.3
+trytond_analytic_invoice >= 2.2, < 2.3
+trytond >= 2.2, < 2.3
\ No newline at end of file
commit 94a4d44d2906b1381a3f4abf1a02d75e5877e5c3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Tue May 24 19:12:42 2011 +0200

    Adding upstream version 2.0.0.

diff --git a/CHANGELOG b/CHANGELOG
index 29d9fb1..f74f0b3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.0.0 - 2011-04-27
+* Bug fixes (see mercurial logs for details)
+
 Version 1.8.0 - 2010-11-01
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index cca7db9..3d2324b 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,6 +1,6 @@
-Copyright (C) 2008-2010 Cédric Krier.
-Copyright (C) 2008-2010 Bertrand Chenal.
-Copyright (C) 2008-2010 B2CK SPRL.
+Copyright (C) 2008-2011 Cédric Krier.
+Copyright (C) 2008-2011 Bertrand Chenal.
+Copyright (C) 2008-2011 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 9cfe448..06f33aa 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.8.0
+Version: 2.0.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/__tryton__.py b/__tryton__.py
index 86cc60b..05765e2 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -2,16 +2,19 @@
 #this repository contains the full copyright notices and license terms.
 {
     'name': 'Analytic Sale',
+    'name_bg_BG': 'Аналитична продажба',
     'name_de_DE': 'Kostenstellen Verkauf',
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '1.8.0',
+    'version': '2.0.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
     'description': '''Add analytic account on sale lines.
 ''',
+    'description_bg_BG': '''Добавя аналитична сметка към редове от продажба
+''',
     'description_de_DE': '''Fügt Kostenstellen zu den Verkaufspositionen hinzu
 ''',
     'description_es_CO': '''Añade cuentas analíticas a las líneas de ventas.
@@ -27,6 +30,7 @@
         'sale.xml',
     ],
     'translation': [
+        'bg_BG.csv',
         'de_DE.csv',
         'es_CO.csv',
         'es_ES.csv',
diff --git a/bg_BG.csv b/bg_BG.csv
new file mode 100644
index 0000000..0d2a361
--- /dev/null
+++ b/bg_BG.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"sale.line,analytic_accounts",0,Analytic Accounts,Аналитични сметки,0
diff --git a/sale.py b/sale.py
index 3353a42..52bc1bf 100644
--- a/sale.py
+++ b/sale.py
@@ -15,10 +15,11 @@ class SaleLine(ModelSQL, ModelView):
                 'invisible': Not(Equal(Eval('type'), 'line')),
             })
 
-    def _view_look_dom_arch(self, tree, type):
+    def _view_look_dom_arch(self, tree, type, field_children=None):
         analytic_account_obj = self.pool.get('analytic_account.account')
         analytic_account_obj.convert_view(tree)
-        arch, fields, = super(SaleLine, self)._view_look_dom_arch(tree, type)
+        arch, fields, = super(SaleLine, self)._view_look_dom_arch(tree, type,
+            field_children=field_children)
         return arch, fields
 
     def fields_get(self, fields_names=None):
diff --git a/setup.py b/setup.py
index c9ce20e..f290577 100644
--- a/setup.py
+++ b/setup.py
@@ -43,12 +43,15 @@ setup(name='trytond_analytic_sale',
         'Intended Audience :: Financial and Insurance Industry',
         'Intended Audience :: Legal Industry',
         'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: Bulgarian',
         'Natural Language :: English',
         'Natural Language :: French',
         'Natural Language :: German',
         'Natural Language :: Spanish',
         'Operating System :: OS Independent',
-        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.5',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         'Topic :: Office/Business',
         'Topic :: Office/Business :: Financial :: Accounting',
     ],
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 65cd029..760a624 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.8.0
+Version: 2.0.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.8/
+Download-URL: http://downloads.tryton.org/2.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
@@ -16,11 +16,14 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Financial and Insurance Industry
 Classifier: Intended Audience :: Legal Industry
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: Bulgarian
 Classifier: Natural Language :: English
 Classifier: Natural Language :: French
 Classifier: Natural Language :: German
 Classifier: Natural Language :: Spanish
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2.5
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 2.7
 Classifier: Topic :: Office/Business
 Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 39490a6..3658e53 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -4,6 +4,7 @@ INSTALL
 LICENSE
 MANIFEST.in
 README
+bg_BG.csv
 de_DE.csv
 es_CO.csv
 es_ES.csv
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 96a5fb0..889b1ec 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_sale >= 1.8, < 1.9
-trytond_analytic_account >= 1.8, < 1.9
-trytond_analytic_invoice >= 1.8, < 1.9
-trytond >= 1.8, < 1.9
\ No newline at end of file
+trytond_sale >= 2.0, < 2.1
+trytond_analytic_account >= 2.0, < 2.1
+trytond_analytic_invoice >= 2.0, < 2.1
+trytond >= 2.0, < 2.1
\ No newline at end of file
commit 81a7147186f4ccc6259a7d51f6ad60c67e8e6775
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Nov 4 20:12:10 2010 +0100

    Adding upstream version 1.8.0.

diff --git a/CHANGELOG b/CHANGELOG
index e36b38a..29d9fb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.8.0 - 2010-11-01
+* Bug fixes (see mercurial logs for details)
+
 Version 1.6.0 - 2010-05-13
 * Bug fixes (see mercurial logs for details)
 
diff --git a/INSTALL b/INSTALL
index aa94188..4a428f6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Installing trytond_analytic_sale
 Prerequisites
 -------------
 
- * Python 2.4 or later (http://www.python.org/)
+ * Python 2.5 or later (http://www.python.org/)
  * trytond (http://www.tryton.org/)
  * trytond_sale (http://www.tryton.org/)
  * trytond_analytic_account (http://www.tryton.org/)
diff --git a/PKG-INFO b/PKG-INFO
index 862ed9a..9cfe448 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.6.0
+Version: 1.8.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index e8282f1..86cc60b 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '1.6.0',
+    'version': '1.8.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/sale.py b/sale.py
index b9d9c60..3353a42 100644
--- a/sale.py
+++ b/sale.py
@@ -1,8 +1,9 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
-"Sale"
+from __future__ import with_statement
 from trytond.model import ModelView, ModelSQL, fields
 from trytond.pyson import Not, Equal, Eval
+from trytond.transaction import Transaction
 
 
 class SaleLine(ModelSQL, ModelView):
@@ -14,28 +15,25 @@ class SaleLine(ModelSQL, ModelView):
                 'invisible': Not(Equal(Eval('type'), 'line')),
             })
 
-    def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+    def _view_look_dom_arch(self, tree, type):
         analytic_account_obj = self.pool.get('analytic_account.account')
-        analytic_account_obj.convert_view(cursor, user, tree, context=context)
-        arch, fields, = super(SaleLine, self)._view_look_dom_arch(cursor,
-                user, tree, type, context=context)
+        analytic_account_obj.convert_view(tree)
+        arch, fields, = super(SaleLine, self)._view_look_dom_arch(tree, type)
         return arch, fields
 
-    def fields_get(self, cursor, user, fields_names=None, context=None):
+    def fields_get(self, fields_names=None):
         analytic_account_obj = self.pool.get('analytic_account.account')
 
-        res = super(SaleLine, self).fields_get(cursor, user, fields_names,
-                context=context)
+        res = super(SaleLine, self).fields_get(fields_names)
 
-        analytic_accounts_field = super(SaleLine, self).fields_get(cursor,
-                user, ['analytic_accounts'],
-                context=context)['analytic_accounts']
+        analytic_accounts_field = super(SaleLine, self).fields_get(
+                ['analytic_accounts'])['analytic_accounts']
 
-        res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
-            user, analytic_accounts_field, fields_names, context=context))
+        res.update(analytic_account_obj.analytic_accounts_fields_get(
+                analytic_accounts_field, fields_names))
         return res
 
-    def read(self, cursor, user, ids, fields_names=None, context=None):
+    def read(self, ids, fields_names=None):
         selection_obj = self.pool.get('analytic_account.account.selection')
 
         int_id = False
@@ -49,8 +47,7 @@ class SaleLine(ModelSQL, ModelView):
         else:
             fields_names2 = fields_names
 
-        res = super(SaleLine, self).read(cursor, user, ids,
-                fields_names=fields_names2, context=context)
+        res = super(SaleLine, self).read(ids, fields_names=fields_names2)
 
         if not fields_names:
             fields_names = list(set(self._columns.keys() \
@@ -64,8 +61,11 @@ class SaleLine(ModelSQL, ModelView):
             id2record = {}
             for record in res:
                 id2record[record['id']] = record
-            lines = self.browse(cursor, user, ids, context=context)
+            lines = self.browse(ids)
             for line in lines:
+                for root_id in root_ids:
+                    id2record[line.id]['analytic_account_' \
+                            + str(root_id)] = False
                 if line.type != 'line':
                     continue
                 if not line.analytic_accounts:
@@ -83,7 +83,7 @@ class SaleLine(ModelSQL, ModelView):
             return res[0]
         return res
 
-    def create(self, cursor, user, vals, context=None):
+    def create(self, vals):
         selection_obj = self.pool.get('analytic_account.account.selection')
         vals = vals.copy()
         selection_vals = {}
@@ -94,16 +94,13 @@ class SaleLine(ModelSQL, ModelView):
                     selection_vals['accounts'].append(('add', vals[field]))
                 del vals[field]
         if vals.get('analytic_accounts'):
-            selection_obj.write(cursor, user, vals['analytic_accounts'],
-                    selection_vals, context=context)
+            selection_obj.write(vals['analytic_accounts'], selection_vals)
         elif vals.get('type', 'line') == 'line':
-            selection_id = selection_obj.create(cursor, user, selection_vals,
-                    context=context)
+            selection_id = selection_obj.create(selection_vals)
             vals['analytic_accounts'] = selection_id
-        return super(SaleLine, self).create(cursor, user, vals,
-                context=context)
+        return super(SaleLine, self).create(vals)
 
-    def write(self, cursor, user, ids, vals, context=None):
+    def write(self, ids, vals):
         selection_obj = self.pool.get('analytic_account.account.selection')
         vals = vals.copy()
         if isinstance(ids, (int, long)):
@@ -115,19 +112,19 @@ class SaleLine(ModelSQL, ModelView):
                 selection_vals[root_id] = vals[field]
                 del vals[field]
         if selection_vals:
-            lines = self.browse(cursor, user, ids, context=context)
+            lines = self.browse(ids)
             for line in lines:
                 if line.type != 'line':
                     continue
                 accounts = []
                 if not line.analytic_accounts:
                     # Create missing selection
-                    selection_id = selection_obj.create(cursor, 0, {},
-                            context=context)
-                    self.write(cursor, user, line.id, {
+                    with Transaction().set_user(0):
+                        selection_id = selection_obj.create({})
+                    self.write(line.id, {
                         'analytic_accounts': selection_id,
-                        }, context=context)
-                    line = self.browse(cursor, user, line.id, context=context)
+                        })
+                    line = self.browse(line.id)
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in selection_vals:
                         value = selection_vals[account.root.id]
@@ -139,63 +136,57 @@ class SaleLine(ModelSQL, ModelView):
                     if account_id \
                             and account_id not in accounts:
                         accounts.append(account_id)
-                selection_obj.write(cursor, user, line.analytic_accounts.id, {
+                selection_obj.write(line.analytic_accounts.id, {
                     'accounts': [('set', accounts)],
-                    }, context=context)
-        return super(SaleLine, self).write(cursor, user, ids, vals,
-                context=context)
+                    })
+        return super(SaleLine, self).write(ids, vals)
 
-    def delete(self, cursor, user, ids, context=None):
+    def delete(self, ids):
         selection_obj = self.pool.get('analytic_account.account.selection')
 
         if isinstance(ids, (int, long)):
             ids = [ids]
         selection_ids = []
-        lines = self.browse(cursor, user, ids, context=context)
+        lines = self.browse(ids)
         for line in lines:
             if line.analytic_accounts:
                 selection_ids.append(line.analytic_accounts.id)
 
-        res = super(SaleLine, self).delete(cursor, user, ids,
-                context=context)
-        selection_obj.delete(cursor, user, selection_ids, context=context)
+        res = super(SaleLine, self).delete(ids)
+        selection_obj.delete(selection_ids)
         return res
 
-    def copy(self, cursor, user, ids, default=None, context=None):
+    def copy(self, ids, default=None):
         selection_obj = self.pool.get('analytic_account.account.selection')
 
-        new_ids = super(SaleLine, self).copy(cursor, user, ids,
-                default=default, context=context)
+        new_ids = super(SaleLine, self).copy(ids, default=default)
 
         int_id = False
         if isinstance(new_ids, (int, long)):
             int_id = True
             new_ids = [new_ids]
 
-        for line in self.browse(cursor, user, new_ids, context=context):
+        for line in self.browse(new_ids):
             if line.analytic_accounts:
-                selection_id = selection_obj.copy(cursor, user,
-                        line.analytic_accounts.id, context=context)
-                self.write(cursor, user, line.id, {
+                selection_id = selection_obj.copy(line.analytic_accounts.id)
+                self.write(line.id, {
                     'analytic_accounts': selection_id,
-                    }, context=context)
+                    })
 
         if int_id:
             return new_ids[0]
         return new_ids
 
-    def get_invoice_line(self, cursor, user, line, context=None):
+    def get_invoice_line(self, line):
         account_selection_obj = self.pool.get('analytic_account.account.selection')
 
-        res = super(SaleLine, self).get_invoice_line(cursor, user, line,
-                context=context)
+        res = super(SaleLine, self).get_invoice_line(line)
         if not res:
             return res
 
         selection_id = False
         if line.analytic_accounts:
-            selection_id = account_selection_obj.copy(cursor, user,
-                    line.analytic_accounts.id, context=context)
+            selection_id = account_selection_obj.copy(line.analytic_accounts.id)
         for vals in res:
             vals['analytic_accounts'] = selection_id
         return res
@@ -206,26 +197,25 @@ SaleLine()
 class Account(ModelSQL, ModelView):
     _name = 'analytic_account.account'
 
-    def delete(self, cursor, user, ids, context=None):
+    def delete(self, ids):
         sale_line_obj = self.pool.get('sale.line')
-        res = super(Account, self).delete(cursor, user, ids, context=context)
+        res = super(Account, self).delete(ids)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get(cursor.dbname)
+        sale_line_obj.fields_view_get.reset()
         return res
 
-    def create(self, cursor, user, vals, context=None):
+    def create(self, vals):
         sale_line_obj = self.pool.get('sale.line')
-        res = super(Account, self).create(cursor, user, vals, context=context)
+        res = super(Account, self).create(vals)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get(cursor.dbname)
+        sale_line_obj.fields_view_get.reset()
         return res
 
-    def write(self, cursor, user, ids, vals, context=None):
+    def write(self, ids, vals):
         sale_line_obj = self.pool.get('sale.line')
-        res = super(Account, self).write(cursor, user, ids, vals,
-                context=context)
+        res = super(Account, self).write(ids, vals)
         # Restart the cache on the fields_view_get method of sale.line
-        sale_line_obj.fields_view_get(cursor.dbname)
+        sale_line_obj.fields_view_get.reset()
         return res
 
 Account()
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
index 4e0481e..e0edc8e 100644
--- a/tests/test_analytic_sale.py
+++ b/tests/test_analytic_sale.py
@@ -25,7 +25,7 @@ class AnalyticSaleTestCase(unittest.TestCase):
         '''
         Test views.
         '''
-        self.assertRaises(Exception, test_view('analytic_sale'))
+        test_view('analytic_sale')
 
 def suite():
     suite = trytond.tests.test_tryton.suite()
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 65a0dba..65cd029 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.6.0
+Version: 1.8.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.6/
+Download-URL: http://downloads.tryton.org/1.8/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 11c7312..96a5fb0 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,4 +1,4 @@
-trytond_sale >= 1.6, < 1.7
-trytond_analytic_account >= 1.6, < 1.7
-trytond_analytic_invoice >= 1.6, < 1.7
-trytond >= 1.6, < 1.7
\ No newline at end of file
+trytond_sale >= 1.8, < 1.9
+trytond_analytic_account >= 1.8, < 1.9
+trytond_analytic_invoice >= 1.8, < 1.9
+trytond >= 1.8, < 1.9
\ No newline at end of file
commit 64ea21ac7768a8140fe4fd7dd96e06dcfa3cc149
Author: Mathias Behrle <mathiasb at mbsolutions.selfip.biz>
Date:   Thu May 13 20:41:31 2010 +0200

    Adding upstream version 1.6.0.

diff --git a/CHANGELOG b/CHANGELOG
index b4765f1..e36b38a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.6.0 - 2010-05-13
+* Bug fixes (see mercurial logs for details)
+
 Version 1.4.0 - 2009-10-19
 * Bug fixes (see mercurial logs for details)
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 853f1f7..cca7db9 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,6 @@
-Copyright (C) 2008-2009 Cédric Krier.
-Copyright (C) 2008-2009 B2CK SPRL.
+Copyright (C) 2008-2010 Cédric Krier.
+Copyright (C) 2008-2010 Bertrand Chenal.
+Copyright (C) 2008-2010 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/MANIFEST.in b/MANIFEST.in
index c61b52d..5343ad8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,4 +7,3 @@ include LICENSE
 include *.xml
 include *.odt
 include *.csv
-include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 657ca29..862ed9a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.4.0
+Version: 1.6.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index de0b977..e8282f1 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -6,7 +6,7 @@
     'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '1.4.0',
+    'version': '1.6.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/sale.py b/sale.py
index 07568cf..b9d9c60 100644
--- a/sale.py
+++ b/sale.py
@@ -2,6 +2,8 @@
 #this repository contains the full copyright notices and license terms.
 "Sale"
 from trytond.model import ModelView, ModelSQL, fields
+from trytond.pyson import Not, Equal, Eval
+
 
 class SaleLine(ModelSQL, ModelView):
     _name = 'sale.line'
@@ -9,7 +11,7 @@ class SaleLine(ModelSQL, ModelView):
     analytic_accounts = fields.Many2One('analytic_account.account.selection',
             'Analytic Accounts',
             states={
-                'invisible': "type != 'line'",
+                'invisible': Not(Equal(Eval('type'), 'line')),
             })
 
     def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
diff --git a/setup.py b/setup.py
index b59e467..c9ce20e 100644
--- a/setup.py
+++ b/setup.py
@@ -2,19 +2,22 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from setuptools import setup, find_packages
+from setuptools import setup
 import re
 
-info = eval(file('__tryton__.py').read())
+info = eval(open('__tryton__.py').read())
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+major_version = int(major_version)
+minor_version = int(minor_version)
 
 requires = []
 for dep in info.get('depends', []):
     if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
-        requires.append('trytond_' + dep)
-
-major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
-requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
+        requires.append('trytond_%s >= %s.%s, < %s.%s' %
+                (dep, major_version, minor_version, major_version,
+                    minor_version + 1))
+requires.append('trytond >= %s.%s, < %s.%s' %
+        (major_version, minor_version, major_version, minor_version + 1))
 
 setup(name='trytond_analytic_sale',
     version=info.get('version', '0.0.1'),
@@ -27,6 +30,7 @@ setup(name='trytond_analytic_sale',
     package_dir={'trytond.modules.analytic_sale': '.'},
     packages=[
         'trytond.modules.analytic_sale',
+        'trytond.modules.analytic_sale.tests',
     ],
     package_data={
         'trytond.modules.analytic_sale': info.get('xml', []) \
@@ -55,4 +59,6 @@ setup(name='trytond_analytic_sale',
     [trytond.modules]
     analytic_sale = trytond.modules.analytic_sale
     """,
+    test_suite='tests',
+    test_loader='trytond.test_loader:Loader',
 )
diff --git a/tests/__init__.py b/tests/__init__.py
index ae14b01..84d3729 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,4 +1,4 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 
-from test_analytic_sale import *
+from test_analytic_sale import suite
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
index 62e27c3..4e0481e 100644
--- a/tests/test_analytic_sale.py
+++ b/tests/test_analytic_sale.py
@@ -10,7 +10,7 @@ if os.path.isdir(DIR):
 
 import unittest
 import trytond.tests.test_tryton
-from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+from trytond.tests.test_tryton import test_view
 
 
 class AnalyticSaleTestCase(unittest.TestCase):
@@ -28,11 +28,10 @@ class AnalyticSaleTestCase(unittest.TestCase):
         self.assertRaises(Exception, test_view('analytic_sale'))
 
 def suite():
-    return unittest.TestLoader().loadTestsFromTestCase(AnalyticSaleTestCase)
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        AnalyticSaleTestCase))
+    return suite
 
 if __name__ == '__main__':
-    suiteTrytond = trytond.tests.test_tryton.suite()
-    suiteAnalyticSale = suite()
-    alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticSale])
-    unittest.TextTestRunner(verbosity=2).run(alltests)
-    SOCK.disconnect()
+    unittest.TextTestRunner(verbosity=2).run(suite())
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 5c61898..65a0dba 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.4.0
+Version: 1.6.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.4/
+Download-URL: http://downloads.tryton.org/1.6/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 78a6e50..39490a6 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -13,8 +13,8 @@ setup.py
 ./__init__.py
 ./__tryton__.py
 ./sale.py
-tests/__init__.py
-tests/test_analytic_sale.py
+./tests/__init__.py
+./tests/test_analytic_sale.py
 trytond_analytic_sale.egg-info/PKG-INFO
 trytond_analytic_sale.egg-info/SOURCES.txt
 trytond_analytic_sale.egg-info/dependency_links.txt
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index d2e87fb..11c7312 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,5 +1,4 @@
-trytond_sale
-trytond_analytic_account
-trytond_analytic_invoice
-trytond >= 1.4
-trytond < 1.5
\ No newline at end of file
+trytond_sale >= 1.6, < 1.7
+trytond_analytic_account >= 1.6, < 1.7
+trytond_analytic_invoice >= 1.6, < 1.7
+trytond >= 1.6, < 1.7
\ No newline at end of file
commit 293cc981ccf48ddacde1e4d36494ec5114e617b8
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Oct 19 21:58:15 2009 +0200

    Adding upstream version 1.4.0.

diff --git a/CHANGELOG b/CHANGELOG
index d28f483..b4765f1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.4.0 - 2009-10-19
+* Bug fixes (see mercurial logs for details)
+
 Version 1.2.0 - 2009-04-20
 * Bug fixes (see mercurial logs for details)
 * Allow egg installation
diff --git a/INSTALL b/INSTALL
index 3a9bc11..aa94188 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
 -------------
 
  * Python 2.4 or later (http://www.python.org/)
- * trytond 1.1.x (http://www.tryton.org/)
+ * trytond (http://www.tryton.org/)
  * trytond_sale (http://www.tryton.org/)
  * trytond_analytic_account (http://www.tryton.org/)
  * trytond_analytic_invoice (http://www.tryton.org/)
diff --git a/MANIFEST.in b/MANIFEST.in
index 5343ad8..c61b52d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -7,3 +7,4 @@ include LICENSE
 include *.xml
 include *.odt
 include *.csv
+include tests/*
diff --git a/PKG-INFO b/PKG-INFO
index 0cf2290..657ca29 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.2.0
+Version: 1.4.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__init__.py b/__init__.py
index 335e3a6..3c25009 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,3 +1,4 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
 
 from sale import *
diff --git a/__tryton__.py b/__tryton__.py
index f2793b4..de0b977 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -4,9 +4,9 @@
     'name': 'Analytic Sale',
     'name_de_DE': 'Kostenstellen Verkauf',
     'name_es_CO': 'Ventas Analíticas',
-    'name_es_ES': 'Ventas Analíticas',
+    'name_es_ES': 'Venta analítica',
     'name_fr_FR': 'Vente analytique',
-    'version': '1.2.0',
+    'version': '1.4.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -16,8 +16,7 @@
 ''',
     'description_es_CO': '''Añade cuentas analíticas a las líneas de ventas.
 ''',
-    'description_es_ES': '''Añade cuentas analíticas a las líneas de ventas.
-''',
+    'description_es_ES': 'Añade contabilidad analítica a las líneas de venta.',
     'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
     'depends': [
         'sale',
diff --git a/de_DE.csv b/de_DE.csv
index 09b14d6..ebf4693 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,107 +1,2 @@
 type,name,res_id,src,value,fuzzy
-error,sale.line,0,The customer location is required!,Der Lagerort des Kunden muss eingegeben werden!,0
-error,sale.sale,0,Wrong combination of method!,Ungültige Kombination von Methoden!,0
-field,"product.template,salable",0,Salable,Verkäuflich,0
-field,"product.template,sale_uom",0,Sale UOM,Einheit Verkauf,0
-field,"sale.line,amount",0,Amount,Betrag,0
 field,"sale.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
-field,"sale.line,description",0,Description,Bezeichnung,0
-field,"sale.line,invoice_lines",0,Invoice Lines,Rechnungspositionen,0
-field,"sale.line,move_done",0,Moves Done,Bewegungen erledigt,0
-field,"sale.line,move_exception",0,Moves Exception,Bewegungsvorbehalt,0
-field,"sale.line,moves",0,Moves,Bewegungen,0
-field,"sale.line,moves_ignored",0,Ignored Moves,Ignorierte Bewegungen,0
-field,"sale.line,product",0,Product,Artikel,0
-field,"sale.line,quantity",0,Quantity,Anzahl,0
-field,"sale.line,sale",0,Sale,Verkauf,0
-field,"sale.line,sequence",0,Sequence,Sequenz,0
-field,"sale.line,taxes",0,Taxes,Steuern,0
-field,"sale.line,type",0,Type,Typ,0
-field,"sale.line,unit",0,Unit,Einheit,0
-field,"sale.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
-field,"sale.line,unit_price",0,Unit Price,Einzelpreis,0
-field,"sale.sale,comment",0,Comment,Kommentar,0
-field,"sale.sale,company",0,Company,Unternehmen,0
-field,"sale.sale,currency",0,Currency,Währung,0
-field,"sale.sale,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
-field,"sale.sale,description",0,Description,Beschreibung,0
-field,"sale.sale,invoice_address",0,Invoice Address,Rechnungsadresse,0
-field,"sale.sale,invoice_exception",0,Invoices Exception,Rechnungsvorbehalt,0
-field,"sale.sale,invoice_method",0,Invoice Method,Rechnungsstellung,0
-field,"sale.sale,invoice_paid",0,Invoices Paid,Bezahlte Rechnungen,0
-field,"sale.sale,invoices",0,Invoices,Rechnungen,0
-field,"sale.sale,invoices_ignored",0,Ignored Invoices,Ignorierte Rechnungen,0
-field,"sale.sale,invoice_state",0,Invoice State,Rechnungsstatus,0
-field,"sale.sale,lines",0,Lines,Positionen,0
-field,"sale.sale,moves",0,Moves,Bewegungen,0
-field,"sale.sale,packing_address",0,Shipment Address,Lieferadresse,0
-field,"sale.sale,packing_done",0,Shipment Done,Gepackt,0
-field,"sale.sale,packing_exception",0,Shipments Exception,Lieferungsvorbehalt,0
-field,"sale.sale,packing_method",0,Shipment Method,Liefermethode,0
-field,"sale.sale,packings",0,Shipments,Lieferposten,0
-field,"sale.sale,packing_state",0,Shipment State,Lieferstatus,0
-field,"sale.sale,party",0,Party,Partei,0
-field,"sale.sale,party_lang",0,Party Language,Sprache Partei,0
-field,"sale.sale,payment_term",0,Payment Term,Zahlungsbedingung,0
-field,"sale.sale,reference",0,Reference,Referenz,0
-field,"sale.sale,sale_date",0,Sale Date,Verkaufsdatum,0
-field,"sale.sale,state",0,State,Status,0
-field,"sale.sale,tax_amount",0,Tax,Steuer,0
-field,"sale.sale,total_amount",0,Total,Gesamt,0
-field,"sale.sale,untaxed_amount",0,Untaxed,Netto,0
-field,"sale.sale,warehouse",0,Warehouse,Warenlager,0
-field,"stock.move,sale",0,Sale,Verkauf,0
-field,"stock.move,sale_line",0,,,0
-odt,sale.sale,0,Amount,Betrag,0
-odt,sale.sale,0,Date:,Datum:,0
-odt,sale.sale,0,Description,Bezeichnung,0
-odt,sale.sale,0,Description:,Bezeichnung:,0
-odt,sale.sale,0,Draft Sale Order,Auftrag (Entwurf),0
-odt,sale.sale,0,E-Mail:,E-Mail:,0
-odt,sale.sale,0,Phone:,Telefon:,0
-odt,sale.sale,0,Quantity,Anzahl,0
-odt,sale.sale,0,Quotation N°:,Angebot Nr.:,0
-odt,sale.sale,0,Sale Order N°:,Auftrag Nr.:,0
-odt,sale.sale,0,Taxes,Steuern,0
-odt,sale.sale,0,Taxes:,Steuern:,0
-odt,sale.sale,0,Total:,Gesamt:,0
-odt,sale.sale,0,Total (excl. taxes):,Netto:,0
-odt,sale.sale,0,Unit Price,Einzelpreis,0
-odt,sale.sale,0,VAT:,USt.:,0
-selection,"sale.line,type",0,Line,Position,0
-selection,"sale.line,type",0,Subtotal,Zwischensumme,0
-selection,"sale.line,type",0,Title,Überschrift,0
-selection,"sale.sale,invoice_method",0,Manual,Manuell,0
-selection,"sale.sale,invoice_method",0,On Order Confirmed,Bei Beauftragung,0
-selection,"sale.sale,invoice_state",0,Exception,Vorbehalt,0
-selection,"sale.sale,invoice_state",0,None,Kein,0
-selection,"sale.sale,invoice_state",0,Paid,Bezahlt,0
-selection,"sale.sale,invoice_state",0,Waiting,Wartend,0
-selection,"sale.sale,packing_method",0,Manual,Manuell,0
-selection,"sale.sale,packing_method",0,On Invoice Paid,Bei Bezahlung,0
-selection,"sale.sale,packing_method",0,On Order Confirmed,Bei Beauftragung,0
-selection,"sale.sale,packing_state",0,Exception,Vorbehalt,0
-selection,"sale.sale,packing_state",0,None,Kein,0
-selection,"sale.sale,packing_state",0,Sent,Gesendet,0
-selection,"sale.sale,packing_state",0,Waiting,Wartend,0
-selection,"sale.sale,state",0,Confirmed,Beauftragt,0
-selection,"sale.sale,state",0,Done,Erledigt,0
-selection,"sale.sale,state",0,Draft,Entwurf,0
-selection,"sale.sale,state",0,Quotation,Angebot,0
-view,product.product,0,Customers,Kunden,0
-view,product.template,0,Customers,Kunden,0
-view,sale.line,0,Products,Artikel,0
-view,sale.line,0,Sale Line,Position Verkauf,0
-view,sale.line,0,Sale Lines,Positionen Verkauf,0
-view,sale.sale,0,Cancel,Annullieren,0
-view,sale.sale,0,Confirm,Bestätigen,0
-view,sale.sale,0,Draft,Entwurf,0
-view,sale.sale,0,Ignore Invoice Exception,Rechnungsvorbehalt ignorieren,0
-view,sale.sale,0,Ignore Packing Exception,Verpackungsvorbehalt ignorieren,0
-view,sale.sale,0,Invoices,Rechnungen,0
-view,sale.sale,0,Lines,Positionen,0
-view,sale.sale,0,Other Info,Sonstiges,0
-view,sale.sale,0,Packings,Lieferposten,0
-view,sale.sale,0,Quotation,Angebot,0
-view,sale.sale,0,Sale,Verkauf,0
-view,sale.sale,0,Sales,Verkäufe,0
diff --git a/sale.xml b/sale.xml
index 4e30f04..0b878e8 100644
--- a/sale.xml
+++ b/sale.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
-<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
+this repository contains the full copyright notices and license terms. -->
 <tryton>
     <data>
         <record model="ir.ui.view" id="sale_line_view_form">
diff --git a/setup.py b/setup.py
index 59a649e..b59e467 100644
--- a/setup.py
+++ b/setup.py
@@ -9,17 +9,12 @@ info = eval(file('__tryton__.py').read())
 
 requires = []
 for dep in info.get('depends', []):
-    match = re.compile(
-            '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
-    if match:
-        continue
-    else:
-        dep = 'trytond_' + dep
-    requires.append(dep)
+    if not re.match(r'(ir|res|workflow|webdav)(\W|$)', dep):
+        requires.append('trytond_' + dep)
 
 major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
 requires.append('trytond >= %s.%s' % (major_version, minor_version))
-requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+requires.append('trytond < %s.%s' % (major_version, int(minor_version) + 1))
 
 setup(name='trytond_analytic_sale',
     version=info.get('version', '0.0.1'),
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..ae14b01
--- /dev/null
+++ b/tests/__init__.py
@@ -0,0 +1,4 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from test_analytic_sale import *
diff --git a/tests/test_analytic_sale.py b/tests/test_analytic_sale.py
new file mode 100644
index 0000000..62e27c3
--- /dev/null
+++ b/tests/test_analytic_sale.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+import sys, os
+DIR = os.path.abspath(os.path.normpath(os.path.join(__file__,
+    '..', '..', '..', '..', '..', 'trytond')))
+if os.path.isdir(DIR):
+    sys.path.insert(0, os.path.dirname(DIR))
+
+import unittest
+import trytond.tests.test_tryton
+from trytond.tests.test_tryton import RPCProxy, CONTEXT, SOCK, test_view
+
+
+class AnalyticSaleTestCase(unittest.TestCase):
+    '''
+    Test AnalyticSale module.
+    '''
+
+    def setUp(self):
+        trytond.tests.test_tryton.install_module('analytic_sale')
+
+    def test0005views(self):
+        '''
+        Test views.
+        '''
+        self.assertRaises(Exception, test_view('analytic_sale'))
+
+def suite():
+    return unittest.TestLoader().loadTestsFromTestCase(AnalyticSaleTestCase)
+
+if __name__ == '__main__':
+    suiteTrytond = trytond.tests.test_tryton.suite()
+    suiteAnalyticSale = suite()
+    alltests = unittest.TestSuite([suiteTrytond, suiteAnalyticSale])
+    unittest.TextTestRunner(verbosity=2).run(alltests)
+    SOCK.disconnect()
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index dff672c..5c61898 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.2.0
+Version: 1.4.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.2/
+Download-URL: http://downloads.tryton.org/1.4/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 21c5a54..78a6e50 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -13,6 +13,8 @@ setup.py
 ./__init__.py
 ./__tryton__.py
 ./sale.py
+tests/__init__.py
+tests/test_analytic_sale.py
 trytond_analytic_sale.egg-info/PKG-INFO
 trytond_analytic_sale.egg-info/SOURCES.txt
 trytond_analytic_sale.egg-info/dependency_links.txt
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index bcfbc56..d2e87fb 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,5 +1,5 @@
 trytond_sale
 trytond_analytic_account
 trytond_analytic_invoice
-trytond >= 1.2
-trytond < 1.3
\ No newline at end of file
+trytond >= 1.4
+trytond < 1.5
\ No newline at end of file
commit d1a1397196a96fbee8b87f3c8422b021cfdc292c
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Apr 21 11:07:34 2009 +0200

    Adding upstream version 1.2.0.

diff --git a/CHANGELOG b/CHANGELOG
index 2521948..d28f483 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,5 @@
-Version 1.0.2 - 2009-03-02
-* Some bug fixes (see mercurial logs for details)
-
-Version 1.0.1 - 2008-12-01
+Version 1.2.0 - 2009-04-20
+* Bug fixes (see mercurial logs for details)
 * Allow egg installation
 
 Version 1.0.0 - 2008-11-17
diff --git a/INSTALL b/INSTALL
index 0399a85..3a9bc11 100644
--- a/INSTALL
+++ b/INSTALL
@@ -5,7 +5,7 @@ Prerequisites
 -------------
 
  * Python 2.4 or later (http://www.python.org/)
- * trytond 0.0.x (http://www.tryton.org/)
+ * trytond 1.1.x (http://www.tryton.org/)
  * trytond_sale (http://www.tryton.org/)
  * trytond_analytic_account (http://www.tryton.org/)
  * trytond_analytic_invoice (http://www.tryton.org/)
@@ -13,7 +13,7 @@ Prerequisites
 Installation
 ------------
 
-Once you've downloaded and unpacked a trytond_analytic_sale source release, enter the
+Once you've downloaded and unpacked the trytond_analytic_sale source release, enter the
 directory where the archive was unpacked, and run:
 
     python setup.py install
diff --git a/PKG-INFO b/PKG-INFO
index 7cfd073..0cf2290 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.0.2
+Version: 1.2.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 4a08b35..f2793b4 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -3,9 +3,10 @@
 {
     'name': 'Analytic Sale',
     'name_de_DE': 'Kostenstellen Verkauf',
-    'name_fr_FR': 'Vente analytique',
+    'name_es_CO': 'Ventas Analíticas',
     'name_es_ES': 'Ventas Analíticas',
-    'version': '1.0.2',
+    'name_fr_FR': 'Vente analytique',
+    'version': '1.2.0',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
@@ -13,9 +14,11 @@
 ''',
     'description_de_DE': '''Fügt Kostenstellen zu den Verkaufspositionen hinzu
 ''',
-    'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
+    'description_es_CO': '''Añade cuentas analíticas a las líneas de ventas.
+''',
     'description_es_ES': '''Añade cuentas analíticas a las líneas de ventas.
 ''',
+    'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
     'depends': [
         'sale',
         'analytic_account',
@@ -26,6 +29,7 @@
     ],
     'translation': [
         'de_DE.csv',
+        'es_CO.csv',
         'es_ES.csv',
         'fr_FR.csv',
     ],
diff --git a/de_DE.csv b/de_DE.csv
index ebf4693..09b14d6 100644
--- a/de_DE.csv
+++ b/de_DE.csv
@@ -1,2 +1,107 @@
 type,name,res_id,src,value,fuzzy
+error,sale.line,0,The customer location is required!,Der Lagerort des Kunden muss eingegeben werden!,0
+error,sale.sale,0,Wrong combination of method!,Ungültige Kombination von Methoden!,0
+field,"product.template,salable",0,Salable,Verkäuflich,0
+field,"product.template,sale_uom",0,Sale UOM,Einheit Verkauf,0
+field,"sale.line,amount",0,Amount,Betrag,0
 field,"sale.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
+field,"sale.line,description",0,Description,Bezeichnung,0
+field,"sale.line,invoice_lines",0,Invoice Lines,Rechnungspositionen,0
+field,"sale.line,move_done",0,Moves Done,Bewegungen erledigt,0
+field,"sale.line,move_exception",0,Moves Exception,Bewegungsvorbehalt,0
+field,"sale.line,moves",0,Moves,Bewegungen,0
+field,"sale.line,moves_ignored",0,Ignored Moves,Ignorierte Bewegungen,0
+field,"sale.line,product",0,Product,Artikel,0
+field,"sale.line,quantity",0,Quantity,Anzahl,0
+field,"sale.line,sale",0,Sale,Verkauf,0
+field,"sale.line,sequence",0,Sequence,Sequenz,0
+field,"sale.line,taxes",0,Taxes,Steuern,0
+field,"sale.line,type",0,Type,Typ,0
+field,"sale.line,unit",0,Unit,Einheit,0
+field,"sale.line,unit_digits",0,Unit Digits,Anzahl Stellen,0
+field,"sale.line,unit_price",0,Unit Price,Einzelpreis,0
+field,"sale.sale,comment",0,Comment,Kommentar,0
+field,"sale.sale,company",0,Company,Unternehmen,0
+field,"sale.sale,currency",0,Currency,Währung,0
+field,"sale.sale,currency_digits",0,Currency Digits,Währung (signifikante Stellen),0
+field,"sale.sale,description",0,Description,Beschreibung,0
+field,"sale.sale,invoice_address",0,Invoice Address,Rechnungsadresse,0
+field,"sale.sale,invoice_exception",0,Invoices Exception,Rechnungsvorbehalt,0
+field,"sale.sale,invoice_method",0,Invoice Method,Rechnungsstellung,0
+field,"sale.sale,invoice_paid",0,Invoices Paid,Bezahlte Rechnungen,0
+field,"sale.sale,invoices",0,Invoices,Rechnungen,0
+field,"sale.sale,invoices_ignored",0,Ignored Invoices,Ignorierte Rechnungen,0
+field,"sale.sale,invoice_state",0,Invoice State,Rechnungsstatus,0
+field,"sale.sale,lines",0,Lines,Positionen,0
+field,"sale.sale,moves",0,Moves,Bewegungen,0
+field,"sale.sale,packing_address",0,Shipment Address,Lieferadresse,0
+field,"sale.sale,packing_done",0,Shipment Done,Gepackt,0
+field,"sale.sale,packing_exception",0,Shipments Exception,Lieferungsvorbehalt,0
+field,"sale.sale,packing_method",0,Shipment Method,Liefermethode,0
+field,"sale.sale,packings",0,Shipments,Lieferposten,0
+field,"sale.sale,packing_state",0,Shipment State,Lieferstatus,0
+field,"sale.sale,party",0,Party,Partei,0
+field,"sale.sale,party_lang",0,Party Language,Sprache Partei,0
+field,"sale.sale,payment_term",0,Payment Term,Zahlungsbedingung,0
+field,"sale.sale,reference",0,Reference,Referenz,0
+field,"sale.sale,sale_date",0,Sale Date,Verkaufsdatum,0
+field,"sale.sale,state",0,State,Status,0
+field,"sale.sale,tax_amount",0,Tax,Steuer,0
+field,"sale.sale,total_amount",0,Total,Gesamt,0
+field,"sale.sale,untaxed_amount",0,Untaxed,Netto,0
+field,"sale.sale,warehouse",0,Warehouse,Warenlager,0
+field,"stock.move,sale",0,Sale,Verkauf,0
+field,"stock.move,sale_line",0,,,0
+odt,sale.sale,0,Amount,Betrag,0
+odt,sale.sale,0,Date:,Datum:,0
+odt,sale.sale,0,Description,Bezeichnung,0
+odt,sale.sale,0,Description:,Bezeichnung:,0
+odt,sale.sale,0,Draft Sale Order,Auftrag (Entwurf),0
+odt,sale.sale,0,E-Mail:,E-Mail:,0
+odt,sale.sale,0,Phone:,Telefon:,0
+odt,sale.sale,0,Quantity,Anzahl,0
+odt,sale.sale,0,Quotation N°:,Angebot Nr.:,0
+odt,sale.sale,0,Sale Order N°:,Auftrag Nr.:,0
+odt,sale.sale,0,Taxes,Steuern,0
+odt,sale.sale,0,Taxes:,Steuern:,0
+odt,sale.sale,0,Total:,Gesamt:,0
+odt,sale.sale,0,Total (excl. taxes):,Netto:,0
+odt,sale.sale,0,Unit Price,Einzelpreis,0
+odt,sale.sale,0,VAT:,USt.:,0
+selection,"sale.line,type",0,Line,Position,0
+selection,"sale.line,type",0,Subtotal,Zwischensumme,0
+selection,"sale.line,type",0,Title,Überschrift,0
+selection,"sale.sale,invoice_method",0,Manual,Manuell,0
+selection,"sale.sale,invoice_method",0,On Order Confirmed,Bei Beauftragung,0
+selection,"sale.sale,invoice_state",0,Exception,Vorbehalt,0
+selection,"sale.sale,invoice_state",0,None,Kein,0
+selection,"sale.sale,invoice_state",0,Paid,Bezahlt,0
+selection,"sale.sale,invoice_state",0,Waiting,Wartend,0
+selection,"sale.sale,packing_method",0,Manual,Manuell,0
+selection,"sale.sale,packing_method",0,On Invoice Paid,Bei Bezahlung,0
+selection,"sale.sale,packing_method",0,On Order Confirmed,Bei Beauftragung,0
+selection,"sale.sale,packing_state",0,Exception,Vorbehalt,0
+selection,"sale.sale,packing_state",0,None,Kein,0
+selection,"sale.sale,packing_state",0,Sent,Gesendet,0
+selection,"sale.sale,packing_state",0,Waiting,Wartend,0
+selection,"sale.sale,state",0,Confirmed,Beauftragt,0
+selection,"sale.sale,state",0,Done,Erledigt,0
+selection,"sale.sale,state",0,Draft,Entwurf,0
+selection,"sale.sale,state",0,Quotation,Angebot,0
+view,product.product,0,Customers,Kunden,0
+view,product.template,0,Customers,Kunden,0
+view,sale.line,0,Products,Artikel,0
+view,sale.line,0,Sale Line,Position Verkauf,0
+view,sale.line,0,Sale Lines,Positionen Verkauf,0
+view,sale.sale,0,Cancel,Annullieren,0
+view,sale.sale,0,Confirm,Bestätigen,0
+view,sale.sale,0,Draft,Entwurf,0
+view,sale.sale,0,Ignore Invoice Exception,Rechnungsvorbehalt ignorieren,0
+view,sale.sale,0,Ignore Packing Exception,Verpackungsvorbehalt ignorieren,0
+view,sale.sale,0,Invoices,Rechnungen,0
+view,sale.sale,0,Lines,Positionen,0
+view,sale.sale,0,Other Info,Sonstiges,0
+view,sale.sale,0,Packings,Lieferposten,0
+view,sale.sale,0,Quotation,Angebot,0
+view,sale.sale,0,Sale,Verkauf,0
+view,sale.sale,0,Sales,Verkäufe,0
diff --git a/es_ES.csv b/es_CO.csv
similarity index 100%
copy from es_ES.csv
copy to es_CO.csv
diff --git a/es_ES.csv b/es_ES.csv
index 6f27e45..bf923cd 100644
--- a/es_ES.csv
+++ b/es_ES.csv
@@ -1,2 +1,2 @@
 type,name,res_id,src,value,fuzzy
-field,"sale.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
+field,"sale.line,analytic_accounts",0,Analytic Accounts,Cuentas analíticas,0
diff --git a/sale.py b/sale.py
index 20d1df5..07568cf 100644
--- a/sale.py
+++ b/sale.py
@@ -1,9 +1,9 @@
-#This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
 "Sale"
+from trytond.model import ModelView, ModelSQL, fields
 
-from trytond.osv import fields, OSV
-
-class SaleLine(OSV):
+class SaleLine(ModelSQL, ModelView):
     _name = 'sale.line'
 
     analytic_accounts = fields.Many2One('analytic_account.account.selection',
@@ -33,15 +33,30 @@ class SaleLine(OSV):
             user, analytic_accounts_field, fields_names, context=context))
         return res
 
-    def _read_flat(self, cursor, user, ids, fields_names, context=None,
-            load='_classic_read'):
+    def read(self, cursor, user, ids, fields_names=None, context=None):
         selection_obj = self.pool.get('analytic_account.account.selection')
-        res = super(SaleLine, self)._read_flat(cursor, user, ids, fields_names,
-                context=context, load=load)
+
+        int_id = False
+        if isinstance(ids, (int, long)):
+            int_id = True
+            ids = [ids]
+
+        if fields_names:
+            fields_names2 = [x for x in fields_names
+                    if not x.startswith('analytic_account_')]
+        else:
+            fields_names2 = fields_names
+
+        res = super(SaleLine, self).read(cursor, user, ids,
+                fields_names=fields_names2, context=context)
+
+        if not fields_names:
+            fields_names = list(set(self._columns.keys() \
+                    + self._inherit_fields.keys()))
 
         root_ids = []
         for field in fields_names:
-            if field.startswith('analytic_account_'):
+            if field.startswith('analytic_account_') and '.' not in field:
                 root_ids.append(int(field[len('analytic_account_'):]))
         if root_ids:
             id2record = {}
@@ -51,10 +66,19 @@ class SaleLine(OSV):
             for line in lines:
                 if line.type != 'line':
                     continue
+                if not line.analytic_accounts:
+                    continue
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in root_ids:
                         id2record[line.id]['analytic_account_' \
                                 + str(account.root.id)] = account.id
+                        for field in fields_names:
+                            if field.startswith('analytic_account_' + \
+                                    str(account.root.id) + '.'):
+                                ham, field2 = field.split('.', 1)
+                                id2record[line.id][field] = account[field2]
+        if int_id:
+            return res[0]
         return res
 
     def create(self, cursor, user, vals, context=None):
@@ -94,6 +118,14 @@ class SaleLine(OSV):
                 if line.type != 'line':
                     continue
                 accounts = []
+                if not line.analytic_accounts:
+                    # Create missing selection
+                    selection_id = selection_obj.create(cursor, 0, {},
+                            context=context)
+                    self.write(cursor, user, line.id, {
+                        'analytic_accounts': selection_id,
+                        }, context=context)
+                    line = self.browse(cursor, user, line.id, context=context)
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in selection_vals:
                         value = selection_vals[account.root.id]
@@ -127,21 +159,29 @@ class SaleLine(OSV):
         selection_obj.delete(cursor, user, selection_ids, context=context)
         return res
 
-    def copy(self, cursor, user, line_id, default=None, context=None):
+    def copy(self, cursor, user, ids, default=None, context=None):
         selection_obj = self.pool.get('analytic_account.account.selection')
 
-        if default is None:
-            default = {}
-        default = default.copy()
-        line = self.browse(cursor, user, line_id, context=context)
-        selection_id = False
-        if line.analytic_accounts:
-            selection_id = selection_obj.copy(cursor, user,
-                    line.analytic_accounts.id, context=context)
-        default['analytic_accounts'] = selection_id
-        return super(SaleLine, self).copy(cursor, user, line_id,
+        new_ids = super(SaleLine, self).copy(cursor, user, ids,
                 default=default, context=context)
 
+        int_id = False
+        if isinstance(new_ids, (int, long)):
+            int_id = True
+            new_ids = [new_ids]
+
+        for line in self.browse(cursor, user, new_ids, context=context):
+            if line.analytic_accounts:
+                selection_id = selection_obj.copy(cursor, user,
+                        line.analytic_accounts.id, context=context)
+                self.write(cursor, user, line.id, {
+                    'analytic_accounts': selection_id,
+                    }, context=context)
+
+        if int_id:
+            return new_ids[0]
+        return new_ids
+
     def get_invoice_line(self, cursor, user, line, context=None):
         account_selection_obj = self.pool.get('analytic_account.account.selection')
 
@@ -161,7 +201,7 @@ class SaleLine(OSV):
 SaleLine()
 
 
-class Account(OSV):
+class Account(ModelSQL, ModelView):
     _name = 'analytic_account.account'
 
     def delete(self, cursor, user, ids, context=None):
diff --git a/sale.xml b/sale.xml
index 11e9d25..4e30f04 100644
--- a/sale.xml
+++ b/sale.xml
@@ -9,7 +9,7 @@
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/form/field[@name="amount"]"
+                        expr="/form/notebook/page/field[@name="amount"]"
                         position="after">
                         <group col="4" colspan="4" name="analytic_accounts">
                             <field name="analytic_accounts"/>
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 3b31a20..dff672c 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,13 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.0.2
+Version: 1.2.0
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
-Download-URL: http://downloads.tryton.org/1.0/
+Download-URL: http://downloads.tryton.org/1.2/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index 396e0a1..21c5a54 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -5,6 +5,7 @@ LICENSE
 MANIFEST.in
 README
 de_DE.csv
+es_CO.csv
 es_ES.csv
 fr_FR.csv
 sale.xml
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
index 9b82fe0..bcfbc56 100644
--- a/trytond_analytic_sale.egg-info/requires.txt
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -1,5 +1,5 @@
 trytond_sale
 trytond_analytic_account
 trytond_analytic_invoice
-trytond >= 1.0
-trytond < 1.1
\ No newline at end of file
+trytond >= 1.2
+trytond < 1.3
\ No newline at end of file
commit 26431aca6b6b02971a55de9aa607a8bf3cafef75
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Mar 23 06:52:40 2009 +0100

    Adding upstream version 1.0.2.

diff --git a/CHANGELOG b/CHANGELOG
index 9801fce..2521948 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 1.0.2 - 2009-03-02
+* Some bug fixes (see mercurial logs for details)
+
 Version 1.0.1 - 2008-12-01
 * Allow egg installation
 
diff --git a/COPYRIGHT b/COPYRIGHT
index 2afd2a7..853f1f7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
-Copyright (C) 2008 Cédric Krier.
-Copyright (C) 2008 B2CK SPRL.
+Copyright (C) 2008-2009 Cédric Krier.
+Copyright (C) 2008-2009 B2CK SPRL.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/PKG-INFO b/PKG-INFO
index 13e0bf9..7cfd073 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.0.1
+Version: 1.0.2
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
diff --git a/__tryton__.py b/__tryton__.py
index 3ed700e..4a08b35 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
     'name_de_DE': 'Kostenstellen Verkauf',
     'name_fr_FR': 'Vente analytique',
     'name_es_ES': 'Ventas Analíticas',
-    'version': '1.0.1',
+    'version': '1.0.2',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/sale.py b/sale.py
index df209f9..20d1df5 100644
--- a/sale.py
+++ b/sale.py
@@ -49,6 +49,8 @@ class SaleLine(OSV):
                 id2record[record['id']] = record
             lines = self.browse(cursor, user, ids, context=context)
             for line in lines:
+                if line.type != 'line':
+                    continue
                 for account in line.analytic_accounts.accounts:
                     if account.root.id in root_ids:
                         id2record[line.id]['analytic_account_' \
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index 1d9e6da..3b31a20 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.0.1
+Version: 1.0.2
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
commit a98e2f3bffbbac7a4c52343258c6c5f4219faa3e
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jan 28 14:06:03 2009 +0100

    Adding upstream version 1.0.1.

diff --git a/CHANGELOG b/CHANGELOG
index eacaaef..9801fce 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,5 @@
+Version 1.0.1 - 2008-12-01
+* Allow egg installation
+
 Version 1.0.0 - 2008-11-17
 * Initial release
diff --git a/PKG-INFO b/PKG-INFO
index da75f0c..13e0bf9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond_analytic_sale
-Version: 1.0.0
+Version: 1.0.1
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/__tryton__.py b/__tryton__.py
index 109f2f0..3ed700e 100644
--- a/__tryton__.py
+++ b/__tryton__.py
@@ -5,7 +5,7 @@
     'name_de_DE': 'Kostenstellen Verkauf',
     'name_fr_FR': 'Vente analytique',
     'name_es_ES': 'Ventas Analíticas',
-    'version': '1.0.0',
+    'version': '1.0.1',
     'author': 'B2CK',
     'email': 'info at b2ck.com',
     'website': 'http://www.tryton.org/',
diff --git a/setup.py b/setup.py
index c745029..59a649e 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,8 @@ setup(name='trytond_analytic_sale',
     author=info.get('author', ''),
     author_email=info.get('email', ''),
     url=info.get('website', ''),
+    download_url="http://downloads.tryton.org/" + \
+            info.get('version', '0.0.1').rsplit('.', 1)[0] + '/',
     package_dir={'trytond.modules.analytic_sale': '.'},
     packages=[
         'trytond.modules.analytic_sale',
@@ -53,4 +55,9 @@ setup(name='trytond_analytic_sale',
     ],
     license='GPL-3',
     install_requires=requires,
+    zip_safe=False,
+    entry_points="""
+    [trytond.modules]
+    analytic_sale = trytond.modules.analytic_sale
+    """,
 )
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
index fd0ce3d..1d9e6da 100644
--- a/trytond_analytic_sale.egg-info/PKG-INFO
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -1,12 +1,13 @@
 Metadata-Version: 1.0
 Name: trytond-analytic-sale
-Version: 1.0.0
+Version: 1.0.1
 Summary: Add analytic account on sale lines.
 
 Home-page: http://www.tryton.org/
 Author: B2CK
 Author-email: info at b2ck.com
 License: GPL-3
+Download-URL: http://downloads.tryton.org/1.0/
 Description: UNKNOWN
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
index a4e267f..396e0a1 100644
--- a/trytond_analytic_sale.egg-info/SOURCES.txt
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -15,5 +15,7 @@ setup.py
 trytond_analytic_sale.egg-info/PKG-INFO
 trytond_analytic_sale.egg-info/SOURCES.txt
 trytond_analytic_sale.egg-info/dependency_links.txt
+trytond_analytic_sale.egg-info/entry_points.txt
+trytond_analytic_sale.egg-info/not-zip-safe
 trytond_analytic_sale.egg-info/requires.txt
 trytond_analytic_sale.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_sale.egg-info/entry_points.txt b/trytond_analytic_sale.egg-info/entry_points.txt
new file mode 100644
index 0000000..366f010
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/entry_points.txt
@@ -0,0 +1,4 @@
+
+    [trytond.modules]
+    analytic_sale = trytond.modules.analytic_sale
+    
\ No newline at end of file
diff --git a/trytond_analytic_sale.egg-info/not-zip-safe b/trytond_analytic_sale.egg-info/not-zip-safe
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/not-zip-safe
@@ -0,0 +1 @@
+
commit 5a10e7fd339c9a3a795b097c62db9cd59fcd2eac
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Nov 18 13:05:54 2008 +0100

    Adding upstream version 1.0.0.

diff --git a/CHANGELOG b/CHANGELOG
new file mode 100644
index 0000000..eacaaef
--- /dev/null
+++ b/CHANGELOG
@@ -0,0 +1,2 @@
+Version 1.0.0 - 2008-11-17
+* Initial release
diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000..2afd2a7
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,15 @@
+Copyright (C) 2008 Cédric Krier.
+Copyright (C) 2008 B2CK SPRL.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 0000000..0399a85
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,32 @@
+Installing trytond_analytic_sale
+================================
+
+Prerequisites
+-------------
+
+ * Python 2.4 or later (http://www.python.org/)
+ * trytond 0.0.x (http://www.tryton.org/)
+ * trytond_sale (http://www.tryton.org/)
+ * trytond_analytic_account (http://www.tryton.org/)
+ * trytond_analytic_invoice (http://www.tryton.org/)
+
+Installation
+------------
+
+Once you've downloaded and unpacked a trytond_analytic_sale source release, enter the
+directory where the archive was unpacked, and run:
+
+    python setup.py install
+
+Note that you may need administrator/root privileges for this step, as
+this command will by default attempt to install module to the Python
+site-packages directory on your system.
+
+For advanced options, please refer to the easy_install and/or the distutils
+documentation:
+
+  http://peak.telecommunity.com/DevCenter/EasyInstall
+  http://docs.python.org/inst/inst.html
+
+To use without installation, extract the archive into ``trytond/modules`` with
+the directory name analytic_sale.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..5343ad8
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,9 @@
+include INSTALL
+include README
+include TODO
+include COPYRIGHT
+include CHANGELOG
+include LICENSE
+include *.xml
+include *.odt
+include *.csv
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 0000000..da75f0c
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond_analytic_sale
+Version: 1.0.0
+Summary: Add analytic account on sale lines.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/README b/README
new file mode 100644
index 0000000..f08a185
--- /dev/null
+++ b/README
@@ -0,0 +1,36 @@
+trytond_analytic_sale
+=====================
+
+The analytic_sale module of the Tryton application platform.
+See __tryton__.py
+
+Installing
+----------
+
+See INSTALL
+
+Support
+-------
+
+If you encounter any problems with Tryton, please don't hesitate to ask
+questions on the Tryton bug tracker, mailing list, wiki or IRC channel:
+
+  http://bugs.tryton.org/
+  http://groups.tryton.org/
+  http://wiki.tryton.org/
+  irc://irc.freenode.net/tryton
+
+License
+-------
+
+See LICENSE
+
+Copyright
+---------
+
+See COPYRIGHT
+
+
+For more information please visit the Tryton web site:
+
+  http://www.tryton.org/
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..335e3a6
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,3 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+
+from sale import *
diff --git a/__tryton__.py b/__tryton__.py
new file mode 100644
index 0000000..109f2f0
--- /dev/null
+++ b/__tryton__.py
@@ -0,0 +1,32 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+{
+    'name': 'Analytic Sale',
+    'name_de_DE': 'Kostenstellen Verkauf',
+    'name_fr_FR': 'Vente analytique',
+    'name_es_ES': 'Ventas Analíticas',
+    'version': '1.0.0',
+    'author': 'B2CK',
+    'email': 'info at b2ck.com',
+    'website': 'http://www.tryton.org/',
+    'description': '''Add analytic account on sale lines.
+''',
+    'description_de_DE': '''Fügt Kostenstellen zu den Verkaufspositionen hinzu
+''',
+    'description_fr_FR': 'Ajoute la comptabilité analytique sur les lignes de facture',
+    'description_es_ES': '''Añade cuentas analíticas a las líneas de ventas.
+''',
+    'depends': [
+        'sale',
+        'analytic_account',
+        'analytic_invoice',
+    ],
+    'xml': [
+        'sale.xml',
+    ],
+    'translation': [
+        'de_DE.csv',
+        'es_ES.csv',
+        'fr_FR.csv',
+    ],
+}
diff --git a/de_DE.csv b/de_DE.csv
new file mode 100644
index 0000000..ebf4693
--- /dev/null
+++ b/de_DE.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"sale.line,analytic_accounts",0,Analytic Accounts,Kostenstellen,0
diff --git a/es_ES.csv b/es_ES.csv
new file mode 100644
index 0000000..6f27e45
--- /dev/null
+++ b/es_ES.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"sale.line,analytic_accounts",0,Analytic Accounts,Cuentas Analíticas,0
diff --git a/fr_FR.csv b/fr_FR.csv
new file mode 100644
index 0000000..c95c438
--- /dev/null
+++ b/fr_FR.csv
@@ -0,0 +1,2 @@
+type,name,res_id,src,value,fuzzy
+field,"sale.line,analytic_accounts",0,Analytic Accounts,Comptes analytiques,0
diff --git a/sale.py b/sale.py
new file mode 100644
index 0000000..df209f9
--- /dev/null
+++ b/sale.py
@@ -0,0 +1,187 @@
+#This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms.
+"Sale"
+
+from trytond.osv import fields, OSV
+
+class SaleLine(OSV):
+    _name = 'sale.line'
+
+    analytic_accounts = fields.Many2One('analytic_account.account.selection',
+            'Analytic Accounts',
+            states={
+                'invisible': "type != 'line'",
+            })
+
+    def _view_look_dom_arch(self, cursor, user, tree, type, context=None):
+        analytic_account_obj = self.pool.get('analytic_account.account')
+        analytic_account_obj.convert_view(cursor, user, tree, context=context)
+        arch, fields, = super(SaleLine, self)._view_look_dom_arch(cursor,
+                user, tree, type, context=context)
+        return arch, fields
+
+    def fields_get(self, cursor, user, fields_names=None, context=None):
+        analytic_account_obj = self.pool.get('analytic_account.account')
+
+        res = super(SaleLine, self).fields_get(cursor, user, fields_names,
+                context=context)
+
+        analytic_accounts_field = super(SaleLine, self).fields_get(cursor,
+                user, ['analytic_accounts'],
+                context=context)['analytic_accounts']
+
+        res.update(analytic_account_obj.analytic_accounts_fields_get(cursor,
+            user, analytic_accounts_field, fields_names, context=context))
+        return res
+
+    def _read_flat(self, cursor, user, ids, fields_names, context=None,
+            load='_classic_read'):
+        selection_obj = self.pool.get('analytic_account.account.selection')
+        res = super(SaleLine, self)._read_flat(cursor, user, ids, fields_names,
+                context=context, load=load)
+
+        root_ids = []
+        for field in fields_names:
+            if field.startswith('analytic_account_'):
+                root_ids.append(int(field[len('analytic_account_'):]))
+        if root_ids:
+            id2record = {}
+            for record in res:
+                id2record[record['id']] = record
+            lines = self.browse(cursor, user, ids, context=context)
+            for line in lines:
+                for account in line.analytic_accounts.accounts:
+                    if account.root.id in root_ids:
+                        id2record[line.id]['analytic_account_' \
+                                + str(account.root.id)] = account.id
+        return res
+
+    def create(self, cursor, user, vals, context=None):
+        selection_obj = self.pool.get('analytic_account.account.selection')
+        vals = vals.copy()
+        selection_vals = {}
+        for field in vals.keys():
+            if field.startswith('analytic_account_'):
+                if vals[field]:
+                    selection_vals.setdefault('accounts', [])
+                    selection_vals['accounts'].append(('add', vals[field]))
+                del vals[field]
+        if vals.get('analytic_accounts'):
+            selection_obj.write(cursor, user, vals['analytic_accounts'],
+                    selection_vals, context=context)
+        elif vals.get('type', 'line') == 'line':
+            selection_id = selection_obj.create(cursor, user, selection_vals,
+                    context=context)
+            vals['analytic_accounts'] = selection_id
+        return super(SaleLine, self).create(cursor, user, vals,
+                context=context)
+
+    def write(self, cursor, user, ids, vals, context=None):
+        selection_obj = self.pool.get('analytic_account.account.selection')
+        vals = vals.copy()
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        selection_vals = {}
+        for field in vals.keys():
+            if field.startswith('analytic_account_'):
+                root_id = int(field[len('analytic_account_'):])
+                selection_vals[root_id] = vals[field]
+                del vals[field]
+        if selection_vals:
+            lines = self.browse(cursor, user, ids, context=context)
+            for line in lines:
+                if line.type != 'line':
+                    continue
+                accounts = []
+                for account in line.analytic_accounts.accounts:
+                    if account.root.id in selection_vals:
+                        value = selection_vals[account.root.id]
+                        if value:
+                            accounts.append(value)
+                    else:
+                        accounts.append(account.id)
+                for account_id in selection_vals.values():
+                    if account_id \
+                            and account_id not in accounts:
+                        accounts.append(account_id)
+                selection_obj.write(cursor, user, line.analytic_accounts.id, {
+                    'accounts': [('set', accounts)],
+                    }, context=context)
+        return super(SaleLine, self).write(cursor, user, ids, vals,
+                context=context)
+
+    def delete(self, cursor, user, ids, context=None):
+        selection_obj = self.pool.get('analytic_account.account.selection')
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        selection_ids = []
+        lines = self.browse(cursor, user, ids, context=context)
+        for line in lines:
+            if line.analytic_accounts:
+                selection_ids.append(line.analytic_accounts.id)
+
+        res = super(SaleLine, self).delete(cursor, user, ids,
+                context=context)
+        selection_obj.delete(cursor, user, selection_ids, context=context)
+        return res
+
+    def copy(self, cursor, user, line_id, default=None, context=None):
+        selection_obj = self.pool.get('analytic_account.account.selection')
+
+        if default is None:
+            default = {}
+        default = default.copy()
+        line = self.browse(cursor, user, line_id, context=context)
+        selection_id = False
+        if line.analytic_accounts:
+            selection_id = selection_obj.copy(cursor, user,
+                    line.analytic_accounts.id, context=context)
+        default['analytic_accounts'] = selection_id
+        return super(SaleLine, self).copy(cursor, user, line_id,
+                default=default, context=context)
+
+    def get_invoice_line(self, cursor, user, line, context=None):
+        account_selection_obj = self.pool.get('analytic_account.account.selection')
+
+        res = super(SaleLine, self).get_invoice_line(cursor, user, line,
+                context=context)
+        if not res:
+            return res
+
+        selection_id = False
+        if line.analytic_accounts:
+            selection_id = account_selection_obj.copy(cursor, user,
+                    line.analytic_accounts.id, context=context)
+        for vals in res:
+            vals['analytic_accounts'] = selection_id
+        return res
+
+SaleLine()
+
+
+class Account(OSV):
+    _name = 'analytic_account.account'
+
+    def delete(self, cursor, user, ids, context=None):
+        sale_line_obj = self.pool.get('sale.line')
+        res = super(Account, self).delete(cursor, user, ids, context=context)
+        # Restart the cache on the fields_view_get method of sale.line
+        sale_line_obj.fields_view_get(cursor.dbname)
+        return res
+
+    def create(self, cursor, user, vals, context=None):
+        sale_line_obj = self.pool.get('sale.line')
+        res = super(Account, self).create(cursor, user, vals, context=context)
+        # Restart the cache on the fields_view_get method of sale.line
+        sale_line_obj.fields_view_get(cursor.dbname)
+        return res
+
+    def write(self, cursor, user, ids, vals, context=None):
+        sale_line_obj = self.pool.get('sale.line')
+        res = super(Account, self).write(cursor, user, ids, vals,
+                context=context)
+        # Restart the cache on the fields_view_get method of sale.line
+        sale_line_obj.fields_view_get(cursor.dbname)
+        return res
+
+Account()
diff --git a/sale.xml b/sale.xml
new file mode 100644
index 0000000..11e9d25
--- /dev/null
+++ b/sale.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<!-- This file is part of Tryton.  The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<tryton>
+    <data>
+        <record model="ir.ui.view" id="sale_line_view_form">
+            <field name="model">sale.line</field>
+            <field name="inherit" ref="sale.sale_line_view_form"/>
+            <field name="arch" type="xml">
+                <![CDATA[
+                <data>
+                    <xpath
+                        expr="/form/field[@name="amount"]"
+                        position="after">
+                        <group col="4" colspan="4" name="analytic_accounts">
+                            <field name="analytic_accounts"/>
+                        </group>
+                    </xpath>
+                </data>
+                ]]>
+            </field>
+        </record>
+    </data>
+</tryton>
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..861a9f5
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,5 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c745029
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,56 @@
+#!/usr/bin/env python
+#This file is part of Tryton.  The COPYRIGHT file at the top level of
+#this repository contains the full copyright notices and license terms.
+
+from setuptools import setup, find_packages
+import re
+
+info = eval(file('__tryton__.py').read())
+
+requires = []
+for dep in info.get('depends', []):
+    match = re.compile(
+            '(ir|res|workflow|webdav)((\s|$|<|>|<=|>=|==|!=).*?$)').match(dep)
+    if match:
+        continue
+    else:
+        dep = 'trytond_' + dep
+    requires.append(dep)
+
+major_version, minor_version, _ = info.get('version', '0.0.1').split('.', 2)
+requires.append('trytond >= %s.%s' % (major_version, minor_version))
+requires.append('trytond < %s.%s' % (major_version, str(int(minor_version) + 1)))
+
+setup(name='trytond_analytic_sale',
+    version=info.get('version', '0.0.1'),
+    description=info.get('description', ''),
+    author=info.get('author', ''),
+    author_email=info.get('email', ''),
+    url=info.get('website', ''),
+    package_dir={'trytond.modules.analytic_sale': '.'},
+    packages=[
+        'trytond.modules.analytic_sale',
+    ],
+    package_data={
+        'trytond.modules.analytic_sale': info.get('xml', []) \
+                + info.get('translation', []),
+    },
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Plugins',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Financial and Insurance Industry',
+        'Intended Audience :: Legal Industry',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Natural Language :: English',
+        'Natural Language :: French',
+        'Natural Language :: German',
+        'Natural Language :: Spanish',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Office/Business',
+        'Topic :: Office/Business :: Financial :: Accounting',
+    ],
+    license='GPL-3',
+    install_requires=requires,
+)
diff --git a/trytond_analytic_sale.egg-info/PKG-INFO b/trytond_analytic_sale.egg-info/PKG-INFO
new file mode 100644
index 0000000..fd0ce3d
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/PKG-INFO
@@ -0,0 +1,25 @@
+Metadata-Version: 1.0
+Name: trytond-analytic-sale
+Version: 1.0.0
+Summary: Add analytic account on sale lines.
+
+Home-page: http://www.tryton.org/
+Author: B2CK
+Author-email: info at b2ck.com
+License: GPL-3
+Description: UNKNOWN
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: Plugins
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Financial and Insurance Industry
+Classifier: Intended Audience :: Legal Industry
+Classifier: License :: OSI Approved :: GNU General Public License (GPL)
+Classifier: Natural Language :: English
+Classifier: Natural Language :: French
+Classifier: Natural Language :: German
+Classifier: Natural Language :: Spanish
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Topic :: Office/Business
+Classifier: Topic :: Office/Business :: Financial :: Accounting
diff --git a/trytond_analytic_sale.egg-info/SOURCES.txt b/trytond_analytic_sale.egg-info/SOURCES.txt
new file mode 100644
index 0000000..a4e267f
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/SOURCES.txt
@@ -0,0 +1,19 @@
+CHANGELOG
+COPYRIGHT
+INSTALL
+LICENSE
+MANIFEST.in
+README
+de_DE.csv
+es_ES.csv
+fr_FR.csv
+sale.xml
+setup.py
+./__init__.py
+./__tryton__.py
+./sale.py
+trytond_analytic_sale.egg-info/PKG-INFO
+trytond_analytic_sale.egg-info/SOURCES.txt
+trytond_analytic_sale.egg-info/dependency_links.txt
+trytond_analytic_sale.egg-info/requires.txt
+trytond_analytic_sale.egg-info/top_level.txt
\ No newline at end of file
diff --git a/trytond_analytic_sale.egg-info/dependency_links.txt b/trytond_analytic_sale.egg-info/dependency_links.txt
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/trytond_analytic_sale.egg-info/requires.txt b/trytond_analytic_sale.egg-info/requires.txt
new file mode 100644
index 0000000..9b82fe0
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/requires.txt
@@ -0,0 +1,5 @@
+trytond_sale
+trytond_analytic_account
+trytond_analytic_invoice
+trytond >= 1.0
+trytond < 1.1
\ No newline at end of file
diff --git a/trytond_analytic_sale.egg-info/top_level.txt b/trytond_analytic_sale.egg-info/top_level.txt
new file mode 100644
index 0000000..93df119
--- /dev/null
+++ b/trytond_analytic_sale.egg-info/top_level.txt
@@ -0,0 +1 @@
+trytond
-- 
tryton-modules-analytic-sale



More information about the tryton-debian-vcs mailing list