[tryton-debian-vcs] tryton-modules-analytic-invoice branch debian-wheezy-2.6 created. 1c33e05b47a58819b73118912d89114a8c0d9f01

[Mathias Behrle]

The following commit has been merged in the debian-wheezy-2.6 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-modules-analytic-invoice.git;a=commitdiff;h=1c33e05b47a58819b73118912d89114a8c0d9f01
commit 1c33e05b47a58819b73118912d89114a8c0d9f01
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 12:07:17 2013 +0200

    Releasing debian version 2.6.2-1.

diff --git a/debian/changelog b/debian/changelog
index 1eaf255..2fda064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-modules-analytic-invoice (1:2.6.2-1) experimental; urgency=low
+
+  * Removing Daniel from Uploaders. Thanks for your work! (Closes: #704370).
+  * Versioning watch file for Tryton branch 2.6.
+  * Improving update of major version in Depends.
+  * Merging upstream version 2.6.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Sat, 04 May 2013 02:41:16 +0200
+
 tryton-modules-analytic-invoice (1:2.6.1-2) experimental; urgency=low
 
   * Updating Vcs-Git to correct address.
commit 1154b33a8e3f42ec7a50231cf94602764cd692fd
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat May 4 02:12:23 2013 +0200

    Merging upstream version 2.6.2.

diff --git a/CHANGELOG b/CHANGELOG
index 39c1db7..356ffb5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 2.6.2 - 2013-05-02
+* Bug fixes (see mercurial logs for details)
+
 Version 2.6.1 - 2012-12-23
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 34f802f..f19fa53 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond_analytic_invoice
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module to add analytic accounting on invoice
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/invoice.py b/invoice.py
index ff38301..5bba8ca 100644
--- a/invoice.py
+++ b/invoice.py
@@ -191,7 +191,8 @@ class InvoiceLine:
                     vals['credit'] = value['credit']
                     vals['account'] = account.id
                     vals['journal'] = self.invoice.journal.id
-                    vals['date'] = self.invoice.invoice_date
+                    vals['date'] = (self.invoice.accounting_date 
+                        or self.invoice.invoice_date)
                     vals['reference'] = self.invoice.reference
                     vals['party'] = self.invoice.party.id
                     value['analytic_lines'].append(('create', vals))
diff --git a/tryton.cfg b/tryton.cfg
index b14d8fc..35b37c8 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
 [tryton]
-version=2.6.1
+version=2.6.2
 depends:
     account_invoice
     analytic_account
diff --git a/trytond_analytic_invoice.egg-info/PKG-INFO b/trytond_analytic_invoice.egg-info/PKG-INFO
index bd291ea..4bcd122 100644
--- a/trytond_analytic_invoice.egg-info/PKG-INFO
+++ b/trytond_analytic_invoice.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond-analytic-invoice
-Version: 2.6.1
+Version: 2.6.2
 Summary: Tryton module to add analytic accounting on invoice
 Home-page: http://www.tryton.org/
 Author: Tryton
commit 92d896e9325a1626541e82e7205fd23913556893
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Sat Apr 27 14:54:47 2013 +0200

    Improving update of major version in Depends.
    
    Pulling the major version for Depends directly from the package version.
    Thanks to Ilya Melnikov for pushing the idea.

diff --git a/debian/control b/debian/control
index 16a5aac..e231b87 100644
--- a/debian/control
+++ b/debian/control
@@ -13,9 +13,9 @@ X-Python-Version: >= 2.6
 Package: tryton-modules-analytic-invoice
 Architecture: all
 Depends:
- ${misc:Depends}, ${python:Depends}, tryton-server (>= 2.6),
- tryton-modules-account-invoice (>= 2.6),
- tryton-modules-analytic-account (>= 2.6), python-pkg-resources
+ ${misc:Depends}, ${python:Depends}, tryton-server (>= ${version:major}),
+ tryton-modules-account-invoice (>= ${version:major}),
+ tryton-modules-analytic-account (>= ${version:major}), python-pkg-resources
 Description: Tryton Application Platform (Financial and Accounting Module)
  Tryton is a high-level general purpose application platform written in Python
  and using PostgreSQL as database engine. It is the core base of a complete
diff --git a/debian/rules b/debian/rules
index 1ae0776..0f63ab4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+
 %:
 	dh ${@} --with python2
 
@@ -8,5 +10,8 @@ override_dh_auto_clean:
 
 	rm -rf *.egg-info
 
+override_dh_gencontrol:
+	dh_gencontrol -- -Vversion:major="$(MAJOR)"
+
 override_dh_builddeb:
 	dh_builddeb -- -Zxz -z9
commit ac601bc04b19b7761a6611e88da188edee7a8088
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Apr 24 00:59:37 2013 +0200

    Versioning watch file for Tryton branch 2.6.

diff --git a/debian/watch b/debian/watch
index ab86490..70de011 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-http://downloads.tryton.org/current/ .*trytond_analytic_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
+http://downloads.tryton.org/2.6/ .*trytond_analytic_invoice-(\d.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz))
-- 
tryton-modules-analytic-invoice