Update path patches
This commit is contained in:
parent
a9badab8e9
commit
ff90fad934
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 fiscalyear.py
|
diff -r d57626d6cf3e -r 42b9acc4c201 fiscalyear.py
|
||||||
--- a/modules/account/fiscalyear.py Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/fiscalyear.py Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/fiscalyear.py Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/fiscalyear.py Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -326,6 +326,8 @@
|
@@ -326,6 +326,8 @@
|
||||||
__name__ = 'account.fiscalyear.balance_non_deferral.start'
|
__name__ = 'account.fiscalyear.balance_non_deferral.start'
|
||||||
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
|
fiscalyear = fields.Many2One('account.fiscalyear', 'Fiscal Year',
|
||||||
|
@ -51,8 +51,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 fiscalyear.py
|
||||||
|
|
||||||
class BalanceNonDeferral(Wizard):
|
class BalanceNonDeferral(Wizard):
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 move.py
|
diff -r d57626d6cf3e -r 42b9acc4c201 move.py
|
||||||
--- a/modules/account/move.py Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/move.py Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/move.py Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/move.py Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -49,8 +49,12 @@
|
@@ -49,8 +49,12 @@
|
||||||
number = fields.Char('Number', required=True, readonly=True)
|
number = fields.Char('Number', required=True, readonly=True)
|
||||||
post_number = fields.Char('Post Number', readonly=True,
|
post_number = fields.Char('Post Number', readonly=True,
|
||||||
|
@ -194,8 +194,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 move.py
|
||||||
fiscalyear_ids = [f.id for f in fiscalyears] or [0]
|
fiscalyear_ids = [f.id for f in fiscalyears] or [0]
|
||||||
else:
|
else:
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 period.py
|
diff -r d57626d6cf3e -r 42b9acc4c201 period.py
|
||||||
--- a/modules/account/period.py Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/period.py Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/period.py Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/period.py Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -34,7 +34,14 @@
|
@@ -34,7 +34,14 @@
|
||||||
('close', 'Close'),
|
('close', 'Close'),
|
||||||
], 'State', readonly=True, required=True)
|
], 'State', readonly=True, required=True)
|
||||||
|
@ -258,8 +258,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 period.py
|
||||||
@classmethod
|
@classmethod
|
||||||
def find(cls, company_id, date=None, exception=True, test_state=True):
|
def find(cls, company_id, date=None, exception=True, test_state=True):
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 tax.py
|
diff -r d57626d6cf3e -r 42b9acc4c201 tax.py
|
||||||
--- a/modules/account/tax.py Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/tax.py Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/tax.py Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/tax.py Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -627,9 +627,13 @@
|
@@ -627,9 +627,13 @@
|
||||||
depends=['company', 'type'])
|
depends=['company', 'type'])
|
||||||
invoice_base_code = fields.Many2One('account.tax.code',
|
invoice_base_code = fields.Many2One('account.tax.code',
|
||||||
|
@ -353,8 +353,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 tax.py
|
||||||
class TaxRuleTemplate(ModelSQL, ModelView):
|
class TaxRuleTemplate(ModelSQL, ModelView):
|
||||||
'Tax Rule Template'
|
'Tax Rule Template'
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 view/move_form.xml
|
diff -r d57626d6cf3e -r 42b9acc4c201 view/move_form.xml
|
||||||
--- a/modules/account/view/move_form.xml Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/view/move_form.xml Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/view/move_form.xml Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/view/move_form.xml Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -2,6 +2,9 @@
|
@@ -2,6 +2,9 @@
|
||||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
<!-- 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 repository contains the full copyright notices and license terms. -->
|
||||||
|
@ -366,8 +366,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 view/move_form.xml
|
||||||
<field name="number"/>
|
<field name="number"/>
|
||||||
<label name="post_number"/>
|
<label name="post_number"/>
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 view/move_tree.xml
|
diff -r d57626d6cf3e -r 42b9acc4c201 view/move_tree.xml
|
||||||
--- a/modules/account/view/move_tree.xml Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/view/move_tree.xml Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/view/move_tree.xml Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/view/move_tree.xml Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -2,6 +2,7 @@
|
@@ -2,6 +2,7 @@
|
||||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
<!-- 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 repository contains the full copyright notices and license terms. -->
|
||||||
|
@ -377,8 +377,8 @@ diff -r d57626d6cf3e -r 42b9acc4c201 view/move_tree.xml
|
||||||
<field name="post_number"/>
|
<field name="post_number"/>
|
||||||
<field name="journal"/>
|
<field name="journal"/>
|
||||||
diff -r d57626d6cf3e -r 42b9acc4c201 view/period_tree.xml
|
diff -r d57626d6cf3e -r 42b9acc4c201 view/period_tree.xml
|
||||||
--- a/modules/account/view/period_tree.xml Tue Dec 02 12:54:29 2014 +0100
|
--- .a/trytond/trytond/modules/account/view/period_tree.xml Tue Dec 02 12:54:29 2014 +0100
|
||||||
+++ b/modules/account/view/period_tree.xml Wed Dec 03 16:13:08 2014 +0100
|
+++ .b/trytond/trytond/modules/account/view/period_tree.xml Wed Dec 03 16:13:08 2014 +0100
|
||||||
@@ -2,6 +2,7 @@
|
@@ -2,6 +2,7 @@
|
||||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
<!-- 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 repository contains the full copyright notices and license terms. -->
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 288b4d6b861b -r 78bda42be464 asset.py
|
diff -r 288b4d6b861b -r 78bda42be464 asset.py
|
||||||
--- a/modules/account_asset/asset.py Wed Dec 03 13:58:43 2014 +0100
|
--- .a/trytond/trytond/modules/account_asset/asset.py Wed Dec 03 13:58:43 2014 +0100
|
||||||
+++ b/modules/account_asset/asset.py Wed Dec 03 16:13:09 2014 +0100
|
+++ .b/trytond/trytond/modules/account_asset/asset.py Wed Dec 03 16:13:09 2014 +0100
|
||||||
@@ -44,11 +44,15 @@
|
@@ -44,11 +44,15 @@
|
||||||
('product', '=', Eval('product', -1)),
|
('product', '=', Eval('product', -1)),
|
||||||
),
|
),
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -r 4e1ac035ae80 invoice.py
|
diff -r 4e1ac035ae80 invoice.py
|
||||||
--- a/modules/account_invoice/invoice.py Mon Oct 20 14:37:24 2014 +0200
|
--- .a/trytond/trytond/modules/account_invoice/invoice.py Mon Oct 20 14:37:24 2014 +0200
|
||||||
+++ b/modules/account_invoice/invoice.py Tue Dec 09 18:52:31 2014 +0100
|
+++ .b/trytond/trytond/modules/account_invoice/invoice.py Tue Dec 09 18:52:31 2014 +0100
|
||||||
@@ -114,15 +114,23 @@
|
@@ -114,15 +114,23 @@
|
||||||
'on_change_with_currency_date')
|
'on_change_with_currency_date')
|
||||||
journal = fields.Many2One('account.journal', 'Journal', required=True,
|
journal = fields.Many2One('account.journal', 'Journal', required=True,
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 0feef65b0f4e -r 5dd8c0c2a04c account.py
|
diff -r 0feef65b0f4e -r 5dd8c0c2a04c account.py
|
||||||
--- a/modules/account_payment/account.py Tue Dec 02 12:54:44 2014 +0100
|
--- .a/trytond/trytond/modules/account_payment/account.py Tue Dec 02 12:54:44 2014 +0100
|
||||||
+++ b/modules/account_payment/account.py Wed Dec 03 16:13:20 2014 +0100
|
+++ .b/trytond/trytond/modules/account_payment/account.py Wed Dec 03 16:13:20 2014 +0100
|
||||||
@@ -148,6 +148,7 @@
|
@@ -148,6 +148,7 @@
|
||||||
kind = 'payable'
|
kind = 'payable'
|
||||||
|
|
||||||
|
@ -22,8 +22,8 @@ diff -r 0feef65b0f4e -r 5dd8c0c2a04c account.py
|
||||||
party=line.party,
|
party=line.party,
|
||||||
kind=kind,
|
kind=kind,
|
||||||
diff -r 0feef65b0f4e -r 5dd8c0c2a04c payment.py
|
diff -r 0feef65b0f4e -r 5dd8c0c2a04c payment.py
|
||||||
--- a/modules/account_payment/payment.py Tue Dec 02 12:54:44 2014 +0100
|
--- .a/trytond/trytond/modules/account_payment/payment.py Tue Dec 02 12:54:44 2014 +0100
|
||||||
+++ b/modules/account_payment/payment.py Wed Dec 03 16:13:20 2014 +0100
|
+++ .b/trytond/trytond/modules/account_payment/payment.py Wed Dec 03 16:13:20 2014 +0100
|
||||||
@@ -118,6 +118,7 @@
|
@@ -118,6 +118,7 @@
|
||||||
depends=_DEPENDS + ['currency_digits'])
|
depends=_DEPENDS + ['currency_digits'])
|
||||||
line = fields.Many2One('account.move.line', 'Line', ondelete='RESTRICT',
|
line = fields.Many2One('account.move.line', 'Line', ondelete='RESTRICT',
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -r 05f736458b5e account.py
|
diff -r 05f736458b5e account.py
|
||||||
--- a/modules/account_payment_sepa/account.py Thu Dec 04 23:35:03 2014 +0100
|
--- .a/trytond/trytond/modules/account_payment_sepa/account.py Thu Dec 04 23:35:03 2014 +0100
|
||||||
+++ b/modules/account_payment_sepa/account.py Tue Dec 09 18:39:58 2014 +0100
|
+++ .b/trytond/trytond/modules/account_payment_sepa/account.py Tue Dec 09 18:39:58 2014 +0100
|
||||||
@@ -2,6 +2,7 @@
|
@@ -2,6 +2,7 @@
|
||||||
#this repository contains the full copyright notices and license terms.
|
#this repository contains the full copyright notices and license terms.
|
||||||
from trytond.pool import PoolMeta
|
from trytond.pool import PoolMeta
|
||||||
|
@ -17,8 +17,8 @@ diff -r 05f736458b5e account.py
|
||||||
+ None]),
|
+ None]),
|
||||||
]))
|
]))
|
||||||
diff -r 05f736458b5e payment.py
|
diff -r 05f736458b5e payment.py
|
||||||
--- a/modules/account_payment_sepa/payment.py Thu Dec 04 23:35:03 2014 +0100
|
--- .a/trytond/trytond/modules/account_payment_sepa/payment.py Thu Dec 04 23:35:03 2014 +0100
|
||||||
+++ b/modules/account_payment_sepa/payment.py Tue Dec 09 18:39:58 2014 +0100
|
+++ .b/trytond/trytond/modules/account_payment_sepa/payment.py Tue Dec 09 18:39:58 2014 +0100
|
||||||
@@ -157,7 +157,8 @@
|
@@ -157,7 +157,8 @@
|
||||||
self.sepa_messages = ()
|
self.sepa_messages = ()
|
||||||
message = tmpl.generate(group=self,
|
message = tmpl.generate(group=self,
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 23e4eaac8bff -r 2642b961c2bf statement.py
|
diff -r 23e4eaac8bff -r 2642b961c2bf statement.py
|
||||||
--- a/modules/account_statement/statement.py Tue Dec 02 12:54:50 2014 +0100
|
--- .a/trytond/trytond/modules/account_statement/statement.py Tue Dec 02 12:54:50 2014 +0100
|
||||||
+++ b/modules/account_statement/statement.py Wed Dec 03 16:13:25 2014 +0100
|
+++ .b/trytond/trytond/modules/account_statement/statement.py Wed Dec 03 16:13:25 2014 +0100
|
||||||
@@ -66,12 +66,12 @@
|
@@ -66,12 +66,12 @@
|
||||||
journal = fields.Many2One('account.statement.journal', 'Journal',
|
journal = fields.Many2One('account.statement.journal', 'Journal',
|
||||||
required=True, select=True,
|
required=True, select=True,
|
||||||
|
|
56
country.diff
56
country.diff
|
@ -1,8 +1,8 @@
|
||||||
# Issue: #022388: Correcció subdivisió Vizcaya.
|
# Issue: #022388: Correcció subdivisió Vizcaya.
|
||||||
|
|
||||||
diff -r 9f01290c6922 country.xml
|
diff -r 9f01290c6922 country.xml
|
||||||
--- a/modules/country/country.xml Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/country.xml Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/country.xml Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/country.xml Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -30397,7 +30397,7 @@
|
@@ -30397,7 +30397,7 @@
|
||||||
</record>
|
</record>
|
||||||
|
|
||||||
|
@ -13,8 +13,8 @@ diff -r 9f01290c6922 country.xml
|
||||||
<field name="type">province</field>
|
<field name="type">province</field>
|
||||||
<field name="parent" ref="es-pv"/>
|
<field name="parent" ref="es-pv"/>
|
||||||
diff -r 9f01290c6922 locale/bg_BG.po
|
diff -r 9f01290c6922 locale/bg_BG.po
|
||||||
--- a/modules/country/locale/bg_BG.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/bg_BG.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/bg_BG.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/bg_BG.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5709,8 +5709,8 @@
|
@@ -5709,8 +5709,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -27,8 +27,8 @@ diff -r 9f01290c6922 locale/bg_BG.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/ca_ES.po
|
diff -r 9f01290c6922 locale/ca_ES.po
|
||||||
--- a/modules/country/locale/ca_ES.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/ca_ES.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/ca_ES.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/ca_ES.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -41,8 +41,8 @@ diff -r 9f01290c6922 locale/ca_ES.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/cs_CZ.po
|
diff -r 9f01290c6922 locale/cs_CZ.po
|
||||||
--- a/modules/country/locale/cs_CZ.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/cs_CZ.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/cs_CZ.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/cs_CZ.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -55,8 +55,8 @@ diff -r 9f01290c6922 locale/cs_CZ.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/de_DE.po
|
diff -r 9f01290c6922 locale/de_DE.po
|
||||||
--- a/modules/country/locale/de_DE.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/de_DE.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/de_DE.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/de_DE.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5697,8 +5697,8 @@
|
@@ -5697,8 +5697,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -69,8 +69,8 @@ diff -r 9f01290c6922 locale/de_DE.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/es_AR.po
|
diff -r 9f01290c6922 locale/es_AR.po
|
||||||
--- a/modules/country/locale/es_AR.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/es_AR.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/es_AR.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/es_AR.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -83,8 +83,8 @@ diff -r 9f01290c6922 locale/es_AR.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/es_CO.po
|
diff -r 9f01290c6922 locale/es_CO.po
|
||||||
--- a/modules/country/locale/es_CO.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/es_CO.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/es_CO.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/es_CO.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -97,8 +97,8 @@ diff -r 9f01290c6922 locale/es_CO.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/es_EC.po
|
diff -r 9f01290c6922 locale/es_EC.po
|
||||||
--- a/modules/country/locale/es_EC.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/es_EC.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/es_EC.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/es_EC.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -111,8 +111,8 @@ diff -r 9f01290c6922 locale/es_EC.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/es_ES.po
|
diff -r 9f01290c6922 locale/es_ES.po
|
||||||
--- a/modules/country/locale/es_ES.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/es_ES.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/es_ES.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/es_ES.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -125,8 +125,8 @@ diff -r 9f01290c6922 locale/es_ES.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/fr_FR.po
|
diff -r 9f01290c6922 locale/fr_FR.po
|
||||||
--- a/modules/country/locale/fr_FR.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/fr_FR.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/fr_FR.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/fr_FR.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,7 +5699,7 @@
|
@@ -5699,7 +5699,7 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -137,8 +137,8 @@ diff -r 9f01290c6922 locale/fr_FR.po
|
||||||
|
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
diff -r 9f01290c6922 locale/lt_LT.po
|
diff -r 9f01290c6922 locale/lt_LT.po
|
||||||
--- a/modules/country/locale/lt_LT.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/lt_LT.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/lt_LT.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/lt_LT.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5697,8 +5697,8 @@
|
@@ -5697,8 +5697,8 @@
|
||||||
msgstr "Badachoso provincija"
|
msgstr "Badachoso provincija"
|
||||||
|
|
||||||
|
@ -151,8 +151,8 @@ diff -r 9f01290c6922 locale/lt_LT.po
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
msgid "Burgos"
|
msgid "Burgos"
|
||||||
diff -r 9f01290c6922 locale/nl_NL.po
|
diff -r 9f01290c6922 locale/nl_NL.po
|
||||||
--- a/modules/country/locale/nl_NL.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/nl_NL.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/nl_NL.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/nl_NL.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5713,7 +5713,7 @@
|
@@ -5713,7 +5713,7 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
@ -163,8 +163,8 @@ diff -r 9f01290c6922 locale/nl_NL.po
|
||||||
|
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
diff -r 9f01290c6922 locale/ru_RU.po
|
diff -r 9f01290c6922 locale/ru_RU.po
|
||||||
--- a/modules/country/locale/ru_RU.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/ru_RU.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/ru_RU.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/ru_RU.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5709,7 +5709,7 @@
|
@@ -5709,7 +5709,7 @@
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -175,8 +175,8 @@ diff -r 9f01290c6922 locale/ru_RU.po
|
||||||
|
|
||||||
msgctxt "model:country.subdivision,name:es-bu"
|
msgctxt "model:country.subdivision,name:es-bu"
|
||||||
diff -r 9f01290c6922 locale/sl_SI.po
|
diff -r 9f01290c6922 locale/sl_SI.po
|
||||||
--- a/modules/country/locale/sl_SI.po Mon Oct 20 14:50:30 2014 +0200
|
--- .a/trytond/trytond/modules/country/locale/sl_SI.po Mon Oct 20 14:50:30 2014 +0200
|
||||||
+++ b/modules/country/locale/sl_SI.po Wed Jan 28 00:16:10 2015 +0100
|
+++ .b/trytond/trytond/modules/country/locale/sl_SI.po Wed Jan 28 00:16:10 2015 +0100
|
||||||
@@ -5699,8 +5699,8 @@
|
@@ -5699,8 +5699,8 @@
|
||||||
msgstr "Badajoz"
|
msgstr "Badajoz"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff --git a/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py b/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
diff --git a/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py b/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
||||||
--- a/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
--- .a/trytond/trytond/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
||||||
+++ b/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
+++ .b/trytond/trytond/modules/purchase_shipment_cost/tests/test_purchase_shipment_cost.py
|
||||||
@@ -30,12 +30,12 @@
|
@@ -30,12 +30,12 @@
|
||||||
suite.addTests(doctest.DocFileSuite('scenario_purchase_shipment_cost.rst',
|
suite.addTests(doctest.DocFileSuite('scenario_purchase_shipment_cost.rst',
|
||||||
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
|
setUp=doctest_setup, tearDown=doctest_teardown, encoding='utf-8',
|
||||||
|
|
|
@ -8,8 +8,8 @@ review10091002
|
||||||
Index: invoice.xml
|
Index: invoice.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/account_invoice/invoice.xml
|
--- .a/trytond/trytond/modules/account_invoice/invoice.xml
|
||||||
+++ b/modules/account_invoice/invoice.xml
|
+++ .b/trytond/trytond/modules/account_invoice/invoice.xml
|
||||||
@@ -38,6 +38,17 @@
|
@@ -38,6 +38,17 @@
|
||||||
<field name="act_window" ref="act_invoice_form"/>
|
<field name="act_window" ref="act_invoice_form"/>
|
||||||
</record>
|
</record>
|
||||||
|
@ -33,8 +33,8 @@ Index: invoice.xml
|
||||||
Index: ca_ES.xml
|
Index: ca_ES.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/account_invoice/locale/ca_ES.po
|
--- .a/trytond/trytond/modules/account_invoice/locale/ca_ES.po
|
||||||
+++ b/modules/account_invoice/locale/ca_ES.po
|
+++ .b/trytond/trytond/modules/account_invoice/locale/ca_ES.po
|
||||||
@@ -1053,6 +1053,10 @@
|
@@ -1053,6 +1053,10 @@
|
||||||
msgid "Invoices"
|
msgid "Invoices"
|
||||||
msgstr "Factures"
|
msgstr "Factures"
|
||||||
|
@ -51,8 +51,8 @@ Index: ca_ES.xml
|
||||||
Index: ca_ES.xml
|
Index: ca_ES.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/account_invoice/locale/es_ES.po
|
--- .a/trytond/trytond/modules/account_invoice/locale/es_ES.po
|
||||||
+++ b/modules/account_invoice/locale/es_ES.po
|
+++ .b/trytond/trytond/modules/account_invoice/locale/es_ES.po
|
||||||
@@ -1045,6 +1045,10 @@
|
@@ -1045,6 +1045,10 @@
|
||||||
msgid "Invoices"
|
msgid "Invoices"
|
||||||
msgstr "Todas las facturas"
|
msgstr "Todas las facturas"
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Index: stock.py
|
Index: stock.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- ./modules/stock_lot/stock.py
|
--- .a/trytond/trytond/modules/stock_lot/stock.py
|
||||||
+++ ./modules/stock_lot/stock.py
|
+++ .b/trytond/trytond/modules/stock_lot/stock.py
|
||||||
@@ -80,6 +80,20 @@
|
@@ -80,6 +80,20 @@
|
||||||
for move in moves:
|
for move in moves:
|
||||||
move.check_lot()
|
move.check_lot()
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Index: production.py
|
Index: production.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- ./modules/production/production.py
|
--- .a/trytond/trytond/modules/production/production.py
|
||||||
+++ ./modules/production/production.py
|
+++ .b/trytond/trytond/modules/production/production.py
|
||||||
@@ -441,6 +441,9 @@
|
@@ -441,6 +441,9 @@
|
||||||
production.check_cost()
|
production.check_cost()
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
diff -r ae376b988766 product.py
|
diff -r ae376b988766 product.py
|
||||||
--- a/trytond/trytond/modules/purchase/product.py Mon Oct 20 15:02:51 2014 +0200
|
--- .a/trytond/trytond/modules/purchase/product.py Mon Oct 20 15:02:51 2014 +0200
|
||||||
+++ b/trytond/trytond/modules/purchase/product.py Mon Nov 03 13:24:24 2014 +0100
|
+++ .b/trytond/trytond/modules/purchase/product.py Mon Nov 03 13:24:24 2014 +0100
|
||||||
@@ -132,11 +132,14 @@
|
@@ -132,11 +132,14 @@
|
||||||
for product_supplier in product.product_suppliers:
|
for product_supplier in product.product_suppliers:
|
||||||
if product_supplier.match(pattern):
|
if product_supplier.match(pattern):
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
Index: __init__.py
|
Index: __init__.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- ./modules/stock_lot/__init__.py
|
--- .a/trytond/trytond/modules/stock_lot/__init__.py
|
||||||
+++ ./modules/stock_lot/__init__.py
|
+++ .b/trytond/trytond/modules/stock_lot/__init__.py
|
||||||
@@ -21,4 +21,9 @@
|
@@ -21,4 +21,9 @@
|
||||||
Template,
|
Template,
|
||||||
Product,
|
Product,
|
||||||
|
@ -17,8 +17,8 @@ Index: __init__.py
|
||||||
Index: stock.py
|
Index: stock.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- ./modules/stock_lot/stock.py
|
--- .a/trytond/trytond/modules/stock_lot/stock.py
|
||||||
+++ ./modules/stock_lot/stock.py
|
+++ .b/trytond/trytond/modules/stock_lot/stock.py
|
||||||
@@ -1,17 +1,20 @@
|
@@ -1,17 +1,20 @@
|
||||||
#This file is part of Tryton. The COPYRIGHT file at the top level of
|
#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 repository contains the full copyright notices and license terms.
|
||||||
|
@ -120,8 +120,8 @@ Index: stock.py
|
||||||
Index: stock.xml
|
Index: stock.xml
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- ./modules/stock_lot/stock.xml
|
--- .a/trytond/trytond/modules/stock_lot/stock.xml
|
||||||
+++ ./modules/stock_lot/stock.xml
|
+++ .b/trytond/trytond/modules/stock_lot/stock.xml
|
||||||
@@ -48,6 +48,28 @@
|
@@ -48,6 +48,28 @@
|
||||||
<field name="perm_delete" eval="True"/>
|
<field name="perm_delete" eval="True"/>
|
||||||
</record>
|
</record>
|
||||||
|
@ -157,7 +157,7 @@ Index: view/lot_by_location_start_form.xml
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ ./modules/stock_lot/view/lot_by_location_start_form.xml
|
+++ .b/trytond/trytond/modules/stock_lot/view/lot_by_location_start_form.xml
|
||||||
@@ -0,0 +1,7 @@
|
@@ -0,0 +1,7 @@
|
||||||
+<?xml version="1.0"?>
|
+<?xml version="1.0"?>
|
||||||
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
+<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
||||||
|
|
|
@ -8,8 +8,8 @@ review5881002
|
||||||
Index: modules/sale_shipment_cost/stock.py
|
Index: modules/sale_shipment_cost/stock.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/sale_shipment_cost/stock.py
|
--- .a/trytond/trytond/modules/sale_shipment_cost/stock.py
|
||||||
+++ b/modules/sale_shipment_cost/stock.py
|
+++ .b/trytond/trytond/modules/sale_shipment_cost/stock.py
|
||||||
@@ -12,7 +12,8 @@
|
@@ -12,7 +12,8 @@
|
||||||
class ShipmentOut:
|
class ShipmentOut:
|
||||||
__name__ = 'stock.shipment.out'
|
__name__ = 'stock.shipment.out'
|
||||||
|
|
|
@ -8,8 +8,8 @@ review6021003
|
||||||
Index: account.py
|
Index: account.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/analytic_account/account.py
|
--- .a/trytond/trytond/modules/analytic_account/account.py
|
||||||
+++ b/modules/analytic_account/account.py
|
+++ .b/trytond/trytond/modules/analytic_account/account.py
|
||||||
@@ -124,17 +124,8 @@
|
@@ -124,17 +124,8 @@
|
||||||
def get_balance(cls, accounts, name):
|
def get_balance(cls, accounts, name):
|
||||||
res = {}
|
res = {}
|
||||||
|
|
|
@ -8,8 +8,8 @@ review9911002
|
||||||
Index: modules/stock_supply_production/production.py
|
Index: modules/stock_supply_production/production.py
|
||||||
===================================================================
|
===================================================================
|
||||||
|
|
||||||
--- a/modules/stock_supply_production/production.py
|
--- .a/trytond/trytond/modules/stock_supply_production/production.py
|
||||||
+++ b/modules/stock_supply_production/production.py
|
+++ .b/trytond/trytond/modules/stock_supply_production/production.py
|
||||||
@@ -212,13 +212,33 @@
|
@@ -212,13 +212,33 @@
|
||||||
])
|
])
|
||||||
create_ = StateAction('stock_supply_production.act_production_request')
|
create_ = StateAction('stock_supply_production.act_production_request')
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r ca47fe15e8b2 -r c1cc3484518d configuration.py
|
diff -r ca47fe15e8b2 -r c1cc3484518d configuration.py
|
||||||
--- a/modules/party/configuration.py Tue Dec 02 12:55:24 2014 +0100
|
--- .a/trytond/trytond/modules/party/configuration.py Tue Dec 02 12:55:24 2014 +0100
|
||||||
+++ b/modules/party/configuration.py Wed Dec 03 16:13:47 2014 +0100
|
+++ .b/trytond/trytond/modules/party/configuration.py Wed Dec 03 16:13:47 2014 +0100
|
||||||
@@ -1,6 +1,7 @@
|
@@ -1,6 +1,7 @@
|
||||||
# This file is part of Tryton. The COPYRIGHT file at the top level of
|
# 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 repository contains the full copyright notices and license terms.
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 7bf478a06a93 -r b50beae497b9 production.py
|
diff -r 7bf478a06a93 -r b50beae497b9 production.py
|
||||||
--- a/modules/production/production.py Tue Dec 02 12:55:39 2014 +0100
|
--- .a/trytond/trytond/modules/production/production.py Tue Dec 02 12:55:39 2014 +0100
|
||||||
+++ b/modules/production/production.py Wed Dec 03 16:13:57 2014 +0100
|
+++ .b/trytond/trytond/modules/production/production.py Wed Dec 03 16:13:57 2014 +0100
|
||||||
@@ -104,22 +104,24 @@
|
@@ -104,22 +104,24 @@
|
||||||
domain=[
|
domain=[
|
||||||
('from_location', 'child_of', [Eval('warehouse')], 'parent'),
|
('from_location', 'child_of', [Eval('warehouse')], 'parent'),
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r fd68d64d6d76 -r 5b0d2d2727a6 purchase.py
|
diff -r fd68d64d6d76 -r 5b0d2d2727a6 purchase.py
|
||||||
--- a/modules/purchase/purchase.py Tue Dec 02 12:55:47 2014 +0100
|
--- .a/trytond/trytond/modules/purchase/purchase.py Tue Dec 02 12:55:47 2014 +0100
|
||||||
+++ b/modules/purchase/purchase.py Wed Dec 03 16:14:02 2014 +0100
|
+++ .b/trytond/trytond/modules/purchase/purchase.py Wed Dec 03 16:14:02 2014 +0100
|
||||||
@@ -951,6 +951,8 @@
|
@@ -951,6 +951,8 @@
|
||||||
domain=[('parent', '=', None), ['OR',
|
domain=[('parent', '=', None), ['OR',
|
||||||
('group', '=', None),
|
('group', '=', None),
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r fde9b7af345d -r 23d0b5a3ceb1 sale.py
|
diff -r fde9b7af345d -r 23d0b5a3ceb1 sale.py
|
||||||
--- a/modules/sale/sale.py Tue Dec 02 12:55:52 2014 +0100
|
--- .a/trytond/trytond/modules/sale/sale.py Tue Dec 02 12:55:52 2014 +0100
|
||||||
+++ b/modules/sale/sale.py Wed Dec 03 16:14:05 2014 +0100
|
+++ .b/trytond/trytond/modules/sale/sale.py Wed Dec 03 16:14:05 2014 +0100
|
||||||
@@ -1023,6 +1023,8 @@
|
@@ -1023,6 +1023,8 @@
|
||||||
domain=[('parent', '=', None), ['OR',
|
domain=[('parent', '=', None), ['OR',
|
||||||
('group', '=', None),
|
('group', '=', None),
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# http://codereview.tryton.org/5871002/
|
# http://codereview.tryton.org/5871002/
|
||||||
|
|
||||||
diff -r 46c9a4316548 sale.py
|
diff -r 46c9a4316548 sale.py
|
||||||
--- a/modules/sale/sale.py Thu Dec 04 23:41:16 2014 +0100
|
--- .a/trytond/trytond/modules/sale/sale.py Thu Dec 04 23:41:16 2014 +0100
|
||||||
+++ b/modules/sale/sale.py Wed Dec 17 21:27:11 2014 +0100
|
+++ .b/trytond/trytond/modules/sale/sale.py Wed Dec 17 21:27:11 2014 +0100
|
||||||
@@ -1365,8 +1369,10 @@
|
@@ -1365,8 +1369,10 @@
|
||||||
if old_invoice_line.type != 'line':
|
if old_invoice_line.type != 'line':
|
||||||
continue
|
continue
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 6c18a72971b1 -r 780a8aaeaa78 purchase_request.py
|
diff -r 6c18a72971b1 -r 780a8aaeaa78 purchase_request.py
|
||||||
--- a/modules/stock_supply/purchase_request.py Tue Dec 02 12:56:15 2014 +0100
|
--- .a/trytond/trytond/modules/stock_supply/purchase_request.py Tue Dec 02 12:56:15 2014 +0100
|
||||||
+++ b/modules/stock_supply/purchase_request.py Wed Dec 03 16:14:22 2014 +0100
|
+++ .b/trytond/trytond/modules/stock_supply/purchase_request.py Wed Dec 03 16:14:22 2014 +0100
|
||||||
@@ -176,6 +176,7 @@
|
@@ -176,6 +176,7 @@
|
||||||
# fetch order points
|
# fetch order points
|
||||||
order_points = OrderPoint.search([
|
order_points = OrderPoint.search([
|
||||||
|
|
|
@ -11,8 +11,8 @@
|
||||||
# review7691002
|
# review7691002
|
||||||
|
|
||||||
diff -r 9b27753b5188 -r f8c45f1b4d7d line.py
|
diff -r 9b27753b5188 -r f8c45f1b4d7d line.py
|
||||||
--- a/modules/timesheet/line.py Tue Dec 02 12:56:21 2014 +0100
|
--- .a/trytond/trytond/modules/timesheet/line.py Tue Dec 02 12:56:21 2014 +0100
|
||||||
+++ b/modules/timesheet/line.py Wed Dec 03 16:14:26 2014 +0100
|
+++ .b/trytond/trytond/modules/timesheet/line.py Wed Dec 03 16:14:26 2014 +0100
|
||||||
@@ -10,6 +10,7 @@
|
@@ -10,6 +10,7 @@
|
||||||
from trytond.pyson import Eval, PYSONEncoder, Date
|
from trytond.pyson import Eval, PYSONEncoder, Date
|
||||||
from trytond.transaction import Transaction
|
from trytond.transaction import Transaction
|
||||||
|
@ -83,8 +83,8 @@ diff -r 9b27753b5188 -r f8c45f1b4d7d line.py
|
||||||
def default_employee():
|
def default_employee():
|
||||||
User = Pool().get('res.user')
|
User = Pool().get('res.user')
|
||||||
diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_form.xml
|
diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_form.xml
|
||||||
--- a/modules/timesheet/view/line_form.xml Tue Dec 02 12:56:21 2014 +0100
|
--- .a/trytond/trytond/modules/timesheet/view/line_form.xml Tue Dec 02 12:56:21 2014 +0100
|
||||||
+++ b/modules/timesheet/view/line_form.xml Wed Dec 03 16:14:26 2014 +0100
|
+++ .b/trytond/trytond/modules/timesheet/view/line_form.xml Wed Dec 03 16:14:26 2014 +0100
|
||||||
@@ -3,7 +3,9 @@
|
@@ -3,7 +3,9 @@
|
||||||
this repository contains the full copyright notices and license terms. -->
|
this repository contains the full copyright notices and license terms. -->
|
||||||
<form string="Timesheet Line">
|
<form string="Timesheet Line">
|
||||||
|
@ -97,8 +97,8 @@ diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_form.xml
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
<label name="hours"/>
|
<label name="hours"/>
|
||||||
diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_tree.xml
|
diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_tree.xml
|
||||||
--- a/modules/timesheet/view/line_tree.xml Tue Dec 02 12:56:21 2014 +0100
|
--- .a/trytond/trytond/modules/timesheet/view/line_tree.xml Tue Dec 02 12:56:21 2014 +0100
|
||||||
+++ b/modules/timesheet/view/line_tree.xml Wed Dec 03 16:14:26 2014 +0100
|
+++ .b/trytond/trytond/modules/timesheet/view/line_tree.xml Wed Dec 03 16:14:26 2014 +0100
|
||||||
@@ -2,6 +2,7 @@
|
@@ -2,6 +2,7 @@
|
||||||
<!-- This file is part of Tryton. The COPYRIGHT file at the top level of
|
<!-- 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 repository contains the full copyright notices and license terms. -->
|
||||||
|
@ -108,8 +108,8 @@ diff -r 9b27753b5188 -r f8c45f1b4d7d view/line_tree.xml
|
||||||
<field name="date"/>
|
<field name="date"/>
|
||||||
<field name="hours" widget="float_time" float_time="company_work_time"
|
<field name="hours" widget="float_time" float_time="company_work_time"
|
||||||
diff -r 9b27753b5188 -r f8c45f1b4d7d work.py
|
diff -r 9b27753b5188 -r f8c45f1b4d7d work.py
|
||||||
--- a/modules/timesheet/work.py Tue Dec 02 12:56:21 2014 +0100
|
--- .a/trytond/trytond/modules/timesheet/work.py Tue Dec 02 12:56:21 2014 +0100
|
||||||
+++ b/modules/timesheet/work.py Wed Dec 03 16:14:26 2014 +0100
|
+++ .b/trytond/trytond/modules/timesheet/work.py Wed Dec 03 16:14:26 2014 +0100
|
||||||
@@ -19,10 +19,18 @@
|
@@ -19,10 +19,18 @@
|
||||||
name = fields.Char('Name', required=True)
|
name = fields.Char('Name', required=True)
|
||||||
active = fields.Boolean('Active')
|
active = fields.Boolean('Active')
|
||||||
|
|
Loading…
Reference in New Issue