[tryton-commits] changeset in modules/stock_package:default Rename move state fro...
changeset 0c957ed582b9 in modules/stock_package:default
details:
https://hg.tryton.org/modules/stock_package?cmd=changeset;node=0c957ed582b9
description:
Rename move state from cancel to cancelled
issue8927
review297851002
diffstat:
stock.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (30 lines):
diff -r dccb7900a8df -r 0c957ed582b9 stock.py
--- a/stock.py Sat Jun 06 10:17:30 2020 +0100
+++ b/stock.py Sat Jun 06 10:30:12 2020 +0100
@@ -92,7 +92,7 @@
domain=[
('shipment', '=', Eval('shipment')),
('to_location.type', 'in', ['customer', 'supplier']),
-('state', '!=', 'cancel'),
+('state', '!=', 'cancelled'),
],
add_remove=[
('package', '=', None),
@@ -232,7 +232,7 @@
@property
def packages_moves(self):
-return (m for m in self.outgoing_moves if m.state != 'cancel')
+return (m for m in self.outgoing_moves if m.state != 'cancelled')
class ShipmentInReturn(PackageMixin, object, metaclass=PoolMeta):
@@ -247,7 +247,7 @@
@property
def packages_moves(self):
-return (m for m in self.moves if m.state != 'cancel')
+return (m for m in self.moves if m.state != 'cancelled')
class PackageLabel(Report):
[tryton-commits] changeset in modules/purchase:default Rename move state from can...
changeset 1b4243e78c80 in modules/purchase:default
details: https://hg.tryton.org/modules/purchase?cmd=changeset;node=1b4243e78c80
description:
Rename move state from cancel to cancelled
issue8927
review297851002
diffstat:
purchase.py | 8
stock.py| 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (69 lines):
diff -r cef216d5e21b -r 1b4243e78c80 purchase.py
--- a/purchase.py Sat Jun 06 10:23:14 2020 +0100
+++ b/purchase.py Sat Jun 06 10:30:11 2020 +0100
@@ -1201,7 +1201,7 @@
skip_ids = set(x.id for x in self.moves_ignored
+ self.moves_recreated)
for move in self.moves:
-if move.state == 'cancel' \
+if move.state == 'cancelled' \
and move.id not in skip_ids:
return True
return False
@@ -1404,7 +1404,7 @@
if self.moves:
dates = filter(
None, (m.effective_date or m.planned_date for m in self.moves
-if m.state != 'cancel'))
+if m.state != 'cancelled'))
return min(dates, default=None)
delivery_date = None
if self.delivery_date_edit:
@@ -1636,7 +1636,7 @@
return
moved_quantity = 0
for move in self.moves:
-if move.state != 'cancel':
+if move.state != 'cancelled':
moved_quantity += Uom.compute_qty(
move.uom, move.quantity, self.unit)
if self.quantity < 0:
@@ -1806,7 +1806,7 @@
for line in purchase.lines:
skip = set(line.moves_ignored + line.moves_recreated)
for move in line.moves:
-if move.state == 'cancel' and move not in skip:
+if move.state == 'cancelled' and move not in skip:
moves.append(move.id)
return {
'recreate_moves': moves,
diff -r cef216d5e21b -r 1b4243e78c80 stock.py
--- a/stock.py Sat Jun 06 10:23:14 2020 +0100
+++ b/stock.py Sat Jun 06 10:30:11 2020 +0100
@@ -56,7 +56,7 @@
PurchaseLine = Pool().get('purchase.line')
for shipment in shipments:
for move in shipment.incoming_moves:
-if (move.state == 'cancel'
+if (move.state == 'cancelled'
and isinstance(move.origin, PurchaseLine)):
raise AccessError(
gettext('purchase.msg_purchase_move_reset_draft',
@@ -118,7 +118,7 @@
PurchaseLine = Pool().get('purchase.line')
for shipment in shipments:
for move in shipment.moves:
-if (move.state == 'cancel'
+if (move.state == 'cancelled'
and isinstance(move.origin, PurchaseLine)):
raise AccessError(
gettext('purchase.msg_purchase_move_reset_draft',
@@ -227,7 +227,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@process_purchase_move
def cancel(cls, moves):
super(Move, cls).cancel(moves)
[tryton-commits] changeset in modules/stock_secondary_unit:default Rename move st...
changeset 7607b786d709 in modules/stock_secondary_unit:default
details:
https://hg.tryton.org/modules/stock_secondary_unit?cmd=changeset;node=7607b786d709
description:
Rename move state from cancel to cancelled
issue8927
review297851002
diffstat:
stock.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r e7cfb736e3d2 -r 7607b786d709 stock.py
--- a/stock.py Mon May 04 12:33:27 2020 +0200
+++ b/stock.py Sat Jun 06 10:30:12 2020 +0100
@@ -15,7 +15,8 @@
digits=(16, Eval('secondary_unit_digits', 2)),
states={
'invisible': ~Eval('secondary_unit'),
-'readonly': Eval('state').in_(['cancel', 'assigned', 'done']),
+'readonly': Eval('state').in_(
+['cancelled', 'assigned', 'done']),
},
depends=['secondary_unit_digits', 'secondary_unit', 'state']),
'on_change_with_secondary_quantity', setter='set_secondary')
[tryton-commits] changeset in modules/stock_consignment:default Rename move state...
changeset 6e18d398da51 in modules/stock_consignment:default
details:
https://hg.tryton.org/modules/stock_consignment?cmd=changeset;node=6e18d398da51
description:
Rename move state from cancel to cancelled
issue8927
review297851002
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 7bb751d004b4 -r 6e18d398da51 stock.py
--- a/stock.py Mon May 04 12:30:41 2020 +0200
+++ b/stock.py Sat Jun 06 10:30:11 2020 +0100
@@ -282,7 +282,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@unset_origin_consignment
def cancel(cls, moves):
super(Move, cls).cancel(moves)
[tryton-commits] changeset in modules/purchase_request:default Rename purchase re...
changeset 8b220c599989 in modules/purchase_request:default
details:
https://hg.tryton.org/modules/purchase_request?cmd=changeset;node=8b220c599989
description:
Rename purchase request state from cancel to cancelled
issue8927
review301701003
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 4 ++--
purchase_request.py | 13 +
tests/scenario_purchase_request.rst | 2 +-
4 files changed, 14 insertions(+), 7 deletions(-)
diffs (84 lines):
diff -r b58ab42d7ef7 -r 8b220c599989 CHANGELOG
--- a/CHANGELOG Mon May 04 12:24:25 2020 +0200
+++ b/CHANGELOG Sat Jun 06 10:02:09 2020 +0100
@@ -1,3 +1,5 @@
+* Rename purchase request state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Add employee on requests for some states
diff -r b58ab42d7ef7 -r 8b220c599989 doc/index.rst
--- a/doc/index.rst Mon May 04 12:24:25 2020 +0200
+++ b/doc/index.rst Sat Jun 06 10:02:09 2020 +0100
@@ -28,9 +28,9 @@
A purchase request is in state Done if it is linked to a Purchase
which is in state Done.
-* Cancel
+* Cancelled
- A purchase request is in state Cancel if it is linked to a Purchase
+ A purchase request is Cancelled if it is linked to a Purchase
which is cancelled.
A wizard allows to create purchases based on a selection of draft purchase
diff -r b58ab42d7ef7 -r 8b220c599989 purchase_request.py
--- a/purchase_request.py Mon May 04 12:24:25 2020 +0200
+++ b/purchase_request.py Sat Jun 06 10:02:09 2020 +0100
@@ -84,12 +84,12 @@
exception_ignored = fields.Boolean('Ignored Exception')
purchased_by = employee_field(
-"Purchased By", states=['purchased', 'done', 'cancel', 'exception'])
+"Purchased By", states=['purchased', 'done', 'cancelled', 'exception'])
state = fields.Selection([
('purchased', "Purchased"),
('done', "Done"),
('draft', "Draft"),
-('cancel', "Cancel"),
+('cancelled', "Cancelled"),
('exception', "Exception"),
], "State", required=True, readonly=True, select=True)
@@ -164,6 +164,11 @@
# Migration from 4.4: remove required on origin
tablehandler.not_null_action('origin', action='remove')
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*request.update(
+[request.state], ['cancelled'],
+where=request.state == 'cancel'))
+
def get_rec_name(self, name):
pool = Pool()
Lang = pool.get('ir.lang')
@@ -223,7 +228,7 @@
and not self.exception_ignored):
return 'exception'
elif self.purchase_line.purchase.state == 'cancel':
-return 'cancel'
+return 'cancelled'
elif self.purchase_line.purchase.state == 'done':
return 'done'
else:
@@ -285,7 +290,7 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
diff -r b58ab42d7ef7 -r 8b220c599989 tests/scenario_purchase_request.rst
--- a/tests/scenario_purchase_request.rst Mon May 04 12:24:25 2020 +0200
+++ b/tests/scenario_purchase_request.rst Sat Jun 06 10:02:09 2020 +0100
@@ -209,7 +209,7 @@
... 'purchase.request.handle.purchase.cancellation', [pr])
>>> handle_exception.execute('cancel_request')
>>> pr.state
-'cancel'
+'cancelled'
Re-create the purchase request::
[tryton-commits] changeset in modules/sale_supply_drop_shipment:default Rename pu...
changeset 532eb55caf49 in modules/sale_supply_drop_shipment:default
details:
https://hg.tryton.org/modules/sale_supply_drop_shipment?cmd=changeset;node=532eb55caf49
description:
Rename purchase request state from cancel to cancelled
issue8927
review301701003
diffstat:
tests/scenario_sale_supply_drop_shipment.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 857ff37a0a2c -r 532eb55caf49
tests/scenario_sale_supply_drop_shipment.rst
--- a/tests/scenario_sale_supply_drop_shipment.rst Thu Jun 04 11:05:27
2020 +0100
+++ b/tests/scenario_sale_supply_drop_shipment.rst Sat Jun 06 10:02:09
2020 +0100
@@ -303,7 +303,7 @@
... [purchase_request])
>>> handle_exception.execute('cancel_request')
>>> purchase_request.state
-'cancel'
+'cancelled'
The sale is then in exception::
[tryton-commits] changeset in modules/stock_location_move:default Rename shipment...
changeset 5e141e192705 in modules/stock_location_move:default
details:
https://hg.tryton.org/modules/stock_location_move?cmd=changeset;node=5e141e192705
description:
Rename shipment states from cancel to cancelled
issue8927
review301711002
diffstat:
stock.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r aa026c3885b2 -r 5e141e192705 stock.py
--- a/stock.py Mon May 04 12:31:18 2020 +0200
+++ b/stock.py Sat Jun 06 10:17:30 2020 +0100
@@ -60,7 +60,7 @@
today = Date.today()
shipments = ShipmentInternal.search([
('locations', '!=', None),
-('state', 'not in', ['cancel', 'done']),
+('state', 'not in', ['cancelled', 'done']),
['OR', [
('planned_date', '<=', date),
('planned_date', '>=', today),
@@ -207,7 +207,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@clear_location_assignation
def cancel(cls, shipments):
super(ShipmentInternal, cls).cancel(shipments)
[tryton-commits] changeset in modules/sale_supply_production:default Rename produ...
changeset d38dd4b803c1 in modules/sale_supply_production:default
details:
https://hg.tryton.org/modules/sale_supply_production?cmd=changeset;node=d38dd4b803c1
description:
Rename production state from cancel to cancelled
issue8927
review325451002
diffstat:
production.py | 4 ++--
sale.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (35 lines):
diff -r cf78c7576664 -r d38dd4b803c1 production.py
--- a/production.py Mon May 04 12:30:13 2020 +0200
+++ b/production.py Sat Jun 06 10:19:09 2020 +0100
@@ -44,7 +44,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@process_sale_supply
def cancel(cls, productions):
super().cancel(productions)
@@ -56,7 +56,7 @@
pool = Pool()
SaleLine = pool.get('sale.line')
for production in productions:
-if (production.state == 'cancel'
+if (production.state == 'cancelled'
and isinstance(production.origin, SaleLine)):
raise AccessError(
gettext('sale_supply_production'
diff -r cf78c7576664 -r d38dd4b803c1 sale.py
--- a/sale.py Mon May 04 12:30:13 2020 +0200
+++ b/sale.py Sat Jun 06 10:19:09 2020 +0100
@@ -44,8 +44,8 @@
state = super().get_supply_state(name)
if self.productions:
states = {p.state for p in self.productions}
-if states <= {'running', 'done', 'cancel'}:
-if states == {'cancel'}:
+if states <= {'running', 'done', 'cancelled'}:
+if states == {'cancelled'}:
state = 'cancelled'
else:
state = 'supplied'
[tryton-commits] changeset in modules/production:default Rename production state ...
changeset edfcb7216191 in modules/production:default
details:
https://hg.tryton.org/modules/production?cmd=changeset;node=edfcb7216191
description:
Rename production state from cancel to cancelled
issue8927
review325451002
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 2 +-
production.py | 31 ++-
3 files changed, 21 insertions(+), 14 deletions(-)
diffs (118 lines):
diff -r decd359569fc -r edfcb7216191 CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Sat Jun 06 10:19:09 2020 +0100
@@ -1,3 +1,5 @@
+* Rename production state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Add origin to production
diff -r decd359569fc -r edfcb7216191 doc/index.rst
--- a/doc/index.rst Mon Jun 01 10:08:02 2020 +0100
+++ b/doc/index.rst Sat Jun 06 10:19:09 2020 +0100
@@ -53,7 +53,7 @@
The output moves are in state done.
-* Cancel
+* Cancelled
All moves are cancelled.
diff -r decd359569fc -r edfcb7216191 production.py
--- a/production.py Mon Jun 01 10:08:02 2020 +0100
+++ b/production.py Sat Jun 06 10:19:09 2020 +0100
@@ -35,7 +35,7 @@
depends=['state'])
effective_date = fields.Date('Effective Date',
states={
-'readonly': Eval('state').in_(['cancel', 'done']),
+'readonly': Eval('state').in_(['cancelled', 'done']),
},
depends=['state'])
planned_start_date = fields.Date('Planned Start Date',
@@ -46,7 +46,7 @@
depends=['state', 'planned_date'])
effective_start_date = fields.Date('Effective Start Date',
states={
-'readonly': Eval('state').in_(['cancel', 'running', 'done']),
+'readonly': Eval('state').in_(['cancelled', 'running', 'done']),
},
depends=['state'])
company = fields.Many2One('company.company', 'Company', required=True,
@@ -134,7 +134,7 @@
('company', '=', Eval('company', -1)),
],
states={
-'readonly': (Eval('state').in_(['done', 'cancel'])
+'readonly': (Eval('state').in_(['done', 'cancelled'])
| ~Eval('warehouse') | ~Eval('location')),
},
depends=['warehouse', 'location', 'company'])
@@ -149,7 +149,7 @@
('assigned', 'Assigned'),
('running', 'Running'),
('done', 'Done'),
-('cancel', 'Canceled'),
+('cancelled', 'Cancelled'),
], 'State', readonly=True)
origin = fields.Reference(
"Origin", selection='get_origin', select=True,
@@ -171,11 +171,11 @@
('assigned', 'waiting'),
('waiting', 'waiting'),
('waiting', 'draft'),
-('request', 'cancel'),
-('draft', 'cancel'),
-('waiting', 'cancel'),
-('assigned', 'cancel'),
-('cancel', 'draft'),
+('request', 'cancelled'),
+('draft', 'cancelled'),
+('waiting', 'cancelled'),
+('assigned', 'cancelled'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -185,8 +185,8 @@
},
'draft': {
'invisible': ~Eval('state').in_(['request', 'waiting',
-'cancel']),
-'icon': If(Eval('state') == 'cancel',
+'cancelled']),
+'icon': If(Eval('state') == 'cancelled',
'tryton-clear',
If(Eval('state') == 'request',
'tryton-forward',
@@ -264,6 +264,11 @@
where=(table.planned_start_date == Null)
& (table.planned_date != Null)))
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*table.update(
+[table.state], ['cancelled'],
+where=table.state == 'cancel'))
+
@staticmethod
def default_state():
return 'draft'
@@ -560,7 +565,7 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
@@ -626,7 +631,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, productions):
pool = Pool()
Move = pool.get('stock.move')
[tryton-commits] changeset in modules/production_outsourcing:default Rename produ...
changeset 32207a4af42e in modules/production_outsourcing:default
details:
https://hg.tryton.org/modules/production_outsourcing?cmd=changeset;node=32207a4af42e
description:
Rename production state from cancel to cancelled
issue8927
review325451002
diffstat:
production.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 5e546227a109 -r 32207a4af42e production.py
--- a/production.py Sat Jun 06 10:14:13 2020 +0100
+++ b/production.py Sat Jun 06 10:19:09 2020 +0100
@@ -138,7 +138,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, productions):
pool = Pool()
PurchaseLine = pool.get('purchase.line')
[tryton-commits] changeset in modules/production_work:default Rename production s...
changeset c5e03944cd77 in modules/production_work:default
details:
https://hg.tryton.org/modules/production_work?cmd=changeset;node=c5e03944cd77
description:
Rename production state from cancel to cancelled
issue8927
review325451002
diffstat:
production.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r c2df38006a4c -r c5e03944cd77 production.py
--- a/production.py Mon May 04 12:21:31 2020 +0200
+++ b/production.py Sat Jun 06 10:19:09 2020 +0100
@@ -31,7 +31,7 @@
works = fields.One2Many('production.work', 'production', 'Works',
states={
'readonly': Eval('state').in_(
-['request', 'draft', 'done', 'cancel']),
+['request', 'draft', 'done', 'cancelled']),
},
domain=[
('company', '=', Eval('company', -1)),
@@ -76,7 +76,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, productions):
pool = Pool()
Work = pool.get('production.work')
[tryton-commits] changeset in modules/sale:default Rename shipment states from ca...
changeset 357ea6c5aa97 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=357ea6c5aa97
description:
Rename shipment states from cancel to cancelled
issue8927
review301711002
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r f69ed5e42706 -r 357ea6c5aa97 stock.py
--- a/stock.py Sat Jun 06 10:04:28 2020 +0100
+++ b/stock.py Sat Jun 06 10:17:30 2020 +0100
@@ -52,7 +52,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@process_sale('outgoing_moves')
def cancel(cls, shipments):
super(ShipmentOut, cls).cancel(shipments)
[tryton-commits] changeset in modules/sale_subscription:default Rename subscripti...
changeset 1908ed00325e in modules/sale_subscription:default
details:
https://hg.tryton.org/modules/sale_subscription?cmd=changeset;node=1908ed00325e
description:
Rename subscription state from canceled to cancelled
issue8927
review301701002
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 2 +-
party.py| 2 +-
subscription.py | 31 ++-
4 files changed, 26 insertions(+), 11 deletions(-)
diffs (117 lines):
diff -r 2976b87c16a4 -r 1908ed00325e CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Sat Jun 06 09:58:15 2020 +0100
@@ -1,3 +1,5 @@
+* Rename subscription state from canceled to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Add employee on subscriptions for some states
diff -r 2976b87c16a4 -r 1908ed00325e doc/index.rst
--- a/doc/index.rst Mon Jun 01 10:08:02 2020 +0100
+++ b/doc/index.rst Sat Jun 06 09:58:15 2020 +0100
@@ -39,7 +39,7 @@
- End Date: An optional earlier end date than the subscription.
- States: The state of the subscription. May take one of the following values:
- Draft, Quotation, Running, Closed, Canceled.
+ Draft, Quotation, Running, Closed, Cancelled.
- Company: The company which issue the sale order.
A running subscription can be modified by going back to draft and edit. Some
diff -r 2976b87c16a4 -r 1908ed00325e party.py
--- a/party.py Mon Jun 01 10:08:02 2020 +0100
+++ b/party.py Sat Jun 06 09:58:15 2020 +0100
@@ -27,7 +27,7 @@
subscriptions = Subscription.search([
('party', '=', party.id),
('company', '=', company.id),
-('state', 'not in', ['closed', 'canceled']),
+('state', 'not in', ['closed', 'cancelled']),
])
if subscriptions:
raise EraseError(
diff -r 2976b87c16a4 -r 1908ed00325e subscription.py
--- a/subscription.py Mon Jun 01 10:08:02 2020 +0100
+++ b/subscription.py Sat Jun 06 09:58:15 2020 +0100
@@ -146,15 +146,15 @@
depends=['state'])
quoted_by = employee_field(
-"Quoted By", states=['quotation', 'running', 'closed', 'canceled'])
+"Quoted By", states=['quotation', 'running', 'closed', 'cancelled'])
run_by = employee_field(
-"Run By", states=['running', 'closed', 'canceled'])
+"Run By", states=['running', 'closed', 'cancelled'])
state = fields.Selection([
('draft', "Draft"),
('quotation', "Quotation"),
('running', "Running"),
('closed', "Closed"),
-('canceled', "Canceled"),
+('cancelled', "Cancelled"),
], "State", readonly=True, required=True,
help="The current state of the subscription.")
@@ -166,14 +166,14 @@
('id', 'DESC'),
]
cls._transitions |= set((
-('draft', 'canceled'),
+('draft', 'cancelled'),
('draft', 'quotation'),
-('quotation', 'canceled'),
+('quotation', 'cancelled'),
('quotation', 'draft'),
('quotation', 'running'),
('running', 'draft'),
('running', 'closed'),
-('canceled', 'draft'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -183,7 +183,7 @@
},
'draft': {
'invisible': Eval('state').in_(['draft', 'closed']),
-'icon': If(Eval('state') == 'canceled',
+'icon': If(Eval('state') == 'cancelled',
'tryton-undo', 'tryton-back'),
'depends': ['state'],
},
@@ -201,6 +201,18 @@
})
@classmethod
+def __register__(cls, module_name):
+cursor = Transaction().connection.cursor()
+table = cls.__table__()
+
+super().__register__(module_name)
+
+# Migration from 5.6: rename state canceled to cancelled
+cursor.execute(*table.update(
+[table.state], ['cancelled'],
+where=table.state == 'canceled'))
+
+@classmethod
def default_company(cls):
return Transaction().context.get('company')
@@ -269,12 +281,13 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'canceled', 'muted', '')),
+('/tree', 'visual',
+If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
@ModelView.button
-@Workflow.transition('canceled')
+@Workflow.transition('cancelled')
def cancel(cls, subscriptions):
pass
[tryton-commits] changeset in modules/sale_subscription_asset:default Rename subs...
changeset 33186e0a548d in modules/sale_subscription_asset:default
details:
https://hg.tryton.org/modules/sale_subscription_asset?cmd=changeset;node=33186e0a548d
description:
Rename subscription state from canceled to cancelled
issue8927
review301701002
diffstat:
sale.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r a87facedefd7 -r 33186e0a548d sale.py
--- a/sale.py Mon May 04 12:29:35 2020 +0200
+++ b/sale.py Sat Jun 06 09:58:15 2020 +0100
@@ -50,7 +50,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('canceled')
+@Workflow.transition('cancelled')
def cancel(cls, subscriptions):
pool = Pool()
SubscriptionLine = pool.get('sale.subscription.line')
[tryton-commits] changeset in modules/stock_package:default Rename shipment state...
changeset dccb7900a8df in modules/stock_package:default
details:
https://hg.tryton.org/modules/stock_package?cmd=changeset;node=dccb7900a8df
description:
Rename shipment states from cancel to cancelled
issue8927
review301711002
diffstat:
stock.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (28 lines):
diff -r 9ec21a35d8fa -r dccb7900a8df stock.py
--- a/stock.py Mon May 04 12:32:23 2020 +0200
+++ b/stock.py Sat Jun 06 10:17:30 2020 +0100
@@ -145,7 +145,7 @@
@fields.depends('shipment')
def on_change_with_state(self, name=None):
if (self.shipment
-and self.shipment.state in {'packed', 'done', 'cancel'}):
+and self.shipment.state in {'packed', 'done', 'cancelled'}):
return 'closed'
return 'open'
@@ -177,13 +177,13 @@
__slots__ = ()
packages = fields.One2Many('stock.package', 'shipment', 'Packages',
states={
-'readonly': Eval('state').in_(['packed', 'done', 'cancel']),
+'readonly': Eval('state').in_(['packed', 'done', 'cancelled']),
})
root_packages = fields.Function(fields.One2Many('stock.package',
'shipment', 'Packages',
domain=[('parent', '=', None)],
states={
-'readonly': Eval('state').in_(['packed', 'done', 'cancel']),
+'readonly': Eval('state').in_(['packed', 'done', 'cancelled']),
}), 'get_root_packages', setter='set_root_packages')
def get_root_packages(self, name):
[tryton-commits] changeset in modules/stock:default Rename shipment states from c...
changeset 6646fb98fdfb in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=6646fb98fdfb
description:
Rename shipment states from cancel to cancelled
issue8927
review301711002
diffstat:
CHANGELOG |1 +
doc/index.rst | 10 +-
party.py |2 +-
party.xml |4 +-
shipment.py | 170 ++---
5 files changed, 111 insertions(+), 76 deletions(-)
diffs (630 lines):
diff -r 7d936a1b8de2 -r 6646fb98fdfb CHANGELOG
--- a/CHANGELOG Thu Jun 04 11:08:53 2020 +0100
+++ b/CHANGELOG Sat Jun 06 10:17:30 2020 +0100
@@ -1,3 +1,4 @@
+* Rename shipment states from cancel to cancelled
* Rename inventory state from cancel to cancelled
* Override warehouse with context value for current user
diff -r 7d936a1b8de2 -r 6646fb98fdfb doc/index.rst
--- a/doc/index.rst Thu Jun 04 11:08:53 2020 +0100
+++ b/doc/index.rst Sat Jun 06 10:17:30 2020 +0100
@@ -168,7 +168,7 @@
Inventory and incoming moves are in state Done.
-* Cancel
+* Cancelled
All moves are cancelled.
@@ -222,10 +222,10 @@
The shipment is Done when the outgoing moves have been made,
e.g. when a truck left the warehouse.
-* Cancel
+* Cancelled
A shipment which is not yet completed (not in state Done) can be
- cancelled at any time. This also cancel all the moves.
+ cancelled at any time. This also cancels all the moves.
Internal Shipment
@@ -252,10 +252,10 @@
The shipment is Done when the moves have been made.
-* Cancel
+* Cancelled
A shipment which is not yet completed (not in state Done) can be
- cancelled at any time. This also cancel all the moves.
+ cancelled at any time. This also cancels all the moves.
diff -r 7d936a1b8de2 -r 6646fb98fdfb party.py
--- a/party.py Thu Jun 04 11:08:53 2020 +0100
+++ b/party.py Sat Jun 06 10:17:30 2020 +0100
@@ -39,7 +39,7 @@
shipments = Shipment.search([
(field, '=', party.id),
('company', '=', company.id),
-('state', 'not in', ['done', 'cancel']),
+('state', 'not in', ['done', 'cancelled']),
])
if shipments:
raise EraseError(
diff -r 7d936a1b8de2 -r 6646fb98fdfb party.xml
--- a/party.xml Thu Jun 04 11:08:53 2020 +0100
+++ b/party.xml Sat Jun 06 10:17:30 2020 +0100
@@ -15,7 +15,7 @@
-
+
@@ -35,7 +35,7 @@
-
+
diff -r 7d936a1b8de2 -r 6646fb98fdfb shipment.py
--- a/shipment.py Thu Jun 04 11:08:53 2020 +0100
+++ b/shipment.py Sat Jun 06 10:17:30 2020 +0100
@@ -24,7 +24,7 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@@ -34,7 +34,7 @@
_rec_name = 'number'
effective_date = fields.Date('Effective Date',
states={
-'readonly': Eval('state').in_(['cancel', 'done']),
+'readonly': Eval('state').in_(['cancelled', 'done']),
},
depends=['state'],
help="When the stock was actually received.")
@@ -77,7 +77,7 @@
warehouse = fields.Many2One('stock.location', "Warehouse",
required=True, domain=[('type', '=', 'warehouse')],
states={
-'readonly': (Eval('state').in_(['cancel', 'done'])
+'readonly': (Eval('state').in_(['cancelled', 'done'])
| Eval('incoming_moves', [0]) | Eval('inventory_moves', [0])),
}, depends=['state'],
help="Where the stock is received.")
@@ -107,7 +107,8 @@
('company', '=', Eval('company')),
],
states={
-'readonly': (Eval('state').in_(['received', 'done', 'cancel'])
+'readonly': (
+Eval('state').in_(['received', 'done', 'cancelled'])
| ~Eval('warehouse') | ~Eval('supplier')),
},
depends=['state', 'warehouse', 'supplier_location',
@@ -118,14 +119,14 @@
'Inventory Moves',
domain=[
('from_location', '=', Eval('warehouse_input')),
-If(~Eval('state').in_(['done', 'cancel']),
+If(~Eval('state').in_(['done', 'cancelled']),
('to_location', 'child_of',
[Eval('warehouse_storage', -1)], 'parent'),
(),),
('company', '=', Eval('company')),
],
states={
-'readonly': Eval('state').in_(['draft', 'done', 'cancel']),
+'readonly': Eval('state').in_(['draft', 'done', 'cancelled']),
'invisible': (
Eval('warehouse_input') ==
[tryton-commits] changeset in modules/purchase:default Rename shipment states fro...
changeset 207468844fc1 in modules/purchase:default
details: https://hg.tryton.org/modules/purchase?cmd=changeset;node=207468844fc1
description:
Rename shipment states from cancel to cancelled
issue8927
review301711002
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 515d978c7f4e -r 207468844fc1 stock.py
--- a/stock.py Sat Jun 06 10:14:13 2020 +0100
+++ b/stock.py Sat Jun 06 10:17:29 2020 +0100
@@ -73,7 +73,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@process_purchase('incoming_moves')
def cancel(cls, shipments):
super(ShipmentIn, cls).cancel(shipments)
[tryton-commits] changeset in modules/sale:default Rename sale state from cancel ...
changeset f69ed5e42706 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=f69ed5e42706
description:
Rename sale state from cancel to cancelled
issue8927
review323391002
diffstat:
CHANGELOG | 1 +
party.py | 2 +-
party.xml | 2 +-
sale.py | 46 --
4 files changed, 31 insertions(+), 20 deletions(-)
diffs (189 lines):
diff -r 34484e7618fb -r f69ed5e42706 CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Sat Jun 06 10:04:28 2020 +0100
@@ -1,3 +1,4 @@
+* Rename sale state from cancel to cancelled
* Add window tab for exception states
Version 5.6.0 - 2020-05-04
diff -r 34484e7618fb -r f69ed5e42706 party.py
--- a/party.py Mon Jun 01 10:08:02 2020 +0100
+++ b/party.py Sat Jun 06 10:04:28 2020 +0100
@@ -32,7 +32,7 @@
('shipment_party', '=', party.id),
],
('company', '=', company.id),
-('state', 'not in', ['done', 'cancel']),
+('state', 'not in', ['done', 'cancelled']),
])
if sales:
raise EraseError(
diff -r 34484e7618fb -r f69ed5e42706 party.xml
--- a/party.xml Mon Jun 01 10:08:02 2020 +0100
+++ b/party.xml Sat Jun 06 10:04:28 2020 +0100
@@ -9,7 +9,7 @@
-
+
diff -r 34484e7618fb -r f69ed5e42706 sale.py
--- a/sale.py Mon Jun 01 10:08:02 2020 +0100
+++ b/sale.py Sat Jun 06 10:04:28 2020 +0100
@@ -83,7 +83,8 @@
sale_date = fields.Date('Sale Date',
states={
'readonly': ~Eval('state').in_(['draft', 'quotation']),
-'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+'required': ~Eval('state').in_(
+['draft', 'quotation', 'cancelled']),
},
depends=['state'])
payment_term = fields.Many2One('account.invoice.payment_term',
@@ -122,7 +123,8 @@
],
states={
'readonly': Eval('state') != 'draft',
-'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+'required': ~Eval('state').in_(
+['draft', 'quotation', 'cancelled']),
}, depends=['party', 'invoice_party', 'state'])
shipment_party = fields.Many2One('party.party', 'Shipment Party',
states={
@@ -139,7 +141,8 @@
],
states={
'readonly': Eval('state') != 'draft',
-'required': ~Eval('state').in_(['draft', 'quotation', 'cancel']),
+'required': ~Eval('state').in_(
+['draft', 'quotation', 'cancelled']),
},
depends=['party', 'shipment_party', 'state'])
warehouse = fields.Many2One('stock.location', 'Warehouse',
@@ -236,17 +239,17 @@
quoted_by = employee_field(
"Quoted By",
-states=['quotation', 'confirmed', 'processing', 'done', 'cancel'])
+states=['quotation', 'confirmed', 'processing', 'done', 'cancelled'])
confirmed_by = employee_field(
"Confirmed By",
-states=['confirmed', 'processing', 'done', 'cancel'])
+states=['confirmed', 'processing', 'done', 'cancelled'])
state = fields.Selection([
('draft', "Draft"),
('quotation', "Quotation"),
('confirmed', "Confirmed"),
('processing', "Processing"),
('done', "Done"),
-('cancel', "Canceled"),
+('cancelled', "Cancelled"),
], "State", readonly=True, required=True)
@classmethod
@@ -264,10 +267,10 @@
('processing', 'processing'),
('processing', 'done'),
('done', 'processing'),
-('draft', 'cancel'),
-('quotation', 'cancel'),
+('draft', 'cancelled'),
+('quotation', 'cancelled'),
('quotation', 'draft'),
-('cancel', 'draft'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -276,8 +279,8 @@
},
'draft': {
'invisible': ~Eval('state').in_(
-['cancel', 'quotation', 'confirmed']),
-'icon': If(Eval('state') == 'cancel',
+['cancelled', 'quotation', 'confirmed']),
+'icon': If(Eval('state') == 'cancelled',
'tryton-undo',
'tryton-back'),
'depends': ['state'],
@@ -300,12 +303,12 @@
},
'handle_invoice_exception': {
'invisible': ((Eval('invoice_state') != 'exception')
-| (Eval('state') == 'cancel')),
+| (Eval('state') == 'cancelled')),
'depends': ['state', 'invoice_state'],
[tryton-commits] changeset in modules/sale_opportunity:default Rename sale state ...
changeset d5bd221ea30b in modules/sale_opportunity:default
details:
https://hg.tryton.org/modules/sale_opportunity?cmd=changeset;node=d5bd221ea30b
description:
Rename sale state from cancel to cancelled
issue8927
review323391002
diffstat:
opportunity.py | 2 +-
tests/scenario_sale_opportunity.rst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r 054bd6e56a84 -r d5bd221ea30b opportunity.py
--- a/opportunity.pyMon Jun 01 10:08:02 2020 +0100
+++ b/opportunity.pySat Jun 06 10:04:28 2020 +0100
@@ -404,7 +404,7 @@
@staticmethod
def _sale_lost_states():
-return ['cancel']
+return ['cancelled']
def is_won(self):
sale_won_states = self._sale_won_states()
diff -r 054bd6e56a84 -r d5bd221ea30b tests/scenario_sale_opportunity.rst
--- a/tests/scenario_sale_opportunity.rst Mon Jun 01 10:08:02 2020 +0100
+++ b/tests/scenario_sale_opportunity.rst Sat Jun 06 10:04:28 2020 +0100
@@ -183,7 +183,7 @@
>>> set_user(sale_user)
>>> second_sale.click('cancel')
>>> second_sale.state
-'cancel'
+'cancelled'
Check opportunity amount updated::
[tryton-commits] changeset in modules/sale_promotion_coupon:default Rename sale s...
changeset 00f2f89fd93b in modules/sale_promotion_coupon:default
details:
https://hg.tryton.org/modules/sale_promotion_coupon?cmd=changeset;node=00f2f89fd93b
description:
Rename sale state from cancel to cancelled
issue8927
review323391002
diffstat:
sale.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r f0cf9699b370 -r 00f2f89fd93b sale.py
--- a/sale.py Mon May 04 12:28:07 2020 +0200
+++ b/sale.py Sat Jun 06 10:04:28 2020 +0100
@@ -183,7 +183,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, sales):
for sale in sales:
if sale.coupons:
[tryton-commits] changeset in modules/sale_payment:default Rename sale state from...
changeset 99d7125a8225 in modules/sale_payment:default
details:
https://hg.tryton.org/modules/sale_payment?cmd=changeset;node=99d7125a8225
description:
Rename sale state from cancel to cancelled
issue8927
review323391002
diffstat:
account.py | 2 +-
sale.py | 2 +-
tests/scenario_sale_payment.rst | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diffs (36 lines):
diff -r f41b373f8418 -r 99d7125a8225 account.py
--- a/account.pyFri May 22 11:54:05 2020 +0200
+++ b/account.pySat Jun 06 10:04:28 2020 +0100
@@ -72,7 +72,7 @@
gettext('sale_payment.msg_payment_sale_draft',
sale=self.origin.rec_name,
payment=self.rec_name))
-elif self.state == 'draft' and self.origin.state == 'cancel':
+elif self.state == 'draft' and self.origin.state == 'cancelled':
raise PaymentValidationError(
gettext('sale_payment.msg_payment_sale_cancel',
sale=self.origin.rec_name,
diff -r f41b373f8418 -r 99d7125a8225 sale.py
--- a/sale.py Fri May 22 11:54:05 2020 +0200
+++ b/sale.py Sat Jun 06 10:04:28 2020 +0100
@@ -43,7 +43,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@no_payment('sale_payment.msg_sale_cancel_payment')
def cancel(cls, sales):
super(Sale, cls).cancel(sales)
diff -r f41b373f8418 -r 99d7125a8225 tests/scenario_sale_payment.rst
--- a/tests/scenario_sale_payment.rst Fri May 22 11:54:05 2020 +0200
+++ b/tests/scenario_sale_payment.rst Sat Jun 06 10:04:28 2020 +0100
@@ -143,7 +143,7 @@
>>> sale.click('cancel')
>>> sale.state
-'cancel'
+'cancelled'
Attempt to add a second payment to the cancelled sale::
[tryton-commits] changeset in modules/account_invoice:default Rename invoice stat...
changeset c03842e8190a in modules/account_invoice:default
details:
https://hg.tryton.org/modules/account_invoice?cmd=changeset;node=c03842e8190a
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
CHANGELOG | 2 +
doc/index.rst | 2 +-
invoice.py | 40 +---
party.py| 2 +-
tests/scenario_invoice.rst | 2 +-
tests/scenario_invoice_supplier.rst | 6 ++--
6 files changed, 31 insertions(+), 23 deletions(-)
diffs (206 lines):
diff -r ec6214201a0c -r c03842e8190a CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Sat Jun 06 10:23:14 2020 +0100
@@ -1,3 +1,5 @@
+* Rename invoice state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Allow overpaying invoice
diff -r ec6214201a0c -r c03842e8190a doc/index.rst
--- a/doc/index.rst Mon Jun 01 10:08:02 2020 +0100
+++ b/doc/index.rst Sat Jun 06 10:23:14 2020 +0100
@@ -8,7 +8,7 @@
There are 4 types of invoice: *Invoice*, *Supplier Invoice*, *Credit Note* and
*Supplier Credit Note*. An invoice can be in *Draft*, *Validated*, *Posted*,
-*Paid* or *Canceled*.
+*Paid* or *Cancelled*.
- Company: The company for which the invoice is created.
- Tax Identifier: The tax identifier that will be printed on the invoice
diff -r ec6214201a0c -r c03842e8190a invoice.py
--- a/invoice.pyMon Jun 01 10:08:02 2020 +0100
+++ b/invoice.pySat Jun 06 10:23:14 2020 +0100
@@ -81,11 +81,11 @@
('validated', "Validated"),
('posted', "Posted"),
('paid', "Paid"),
-('cancel', "Cancelled"),
+('cancelled', "Cancelled"),
], "State", readonly=True)
invoice_date = fields.Date('Invoice Date',
states={
-'readonly': Eval('state').in_(['posted', 'paid', 'cancel']),
+'readonly': Eval('state').in_(['posted', 'paid', 'cancelled']),
'required': Eval('state').in_(
If(Eval('type') == 'in',
['validated', 'posted', 'paid'],
@@ -241,10 +241,10 @@
('posted', 'paid'),
('validated', 'draft'),
('paid', 'posted'),
-('draft', 'cancel'),
-('validated', 'cancel'),
-('posted', 'cancel'),
-('cancel', 'draft'),
+('draft', 'cancelled'),
+('validated', 'cancelled'),
+('posted', 'cancelled'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -252,10 +252,11 @@
'depends': ['allow_cancel'],
},
'draft': {
-'invisible': (~Eval('state').in_(['cancel', 'validated'])
-| ((Eval('state') == 'cancel')
+'invisible': (
+~Eval('state').in_(['cancelled', 'validated'])
+| ((Eval('state') == 'cancelled')
& Eval('cancel_move', -1))),
-'icon': If(Eval('state') == 'cancel', 'tryton-undo',
+'icon': If(Eval('state') == 'cancelled', 'tryton-undo',
'tryton-back'),
'depends': ['state'],
},
@@ -349,6 +350,11 @@
# Add index on create_date
table.index_action('create_date', action='add')
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*sql_table.update(
+[sql_table.state], ['cancelled'],
+where=sql_table.state == 'cancel'))
+
@staticmethod
def default_type():
return Transaction().context.get('type', 'out')
@@ -854,7 +860,7 @@
to_delete = []
to_write = []
for invoice in invoices:
-if invoice.state in ('posted', 'paid', 'cancel'):
+if invoice.state in ('posted', 'paid', 'cancelled'):
continue
computed_taxes = invoice._compute_taxes()
if not invoice.taxes:
@@ -1086,7 +1092,7 @@
@property
def is_modifiable(self):
return not (self.state in {'posted', 'paid'}
-or (self.state == 'cancel'
+or (self.state == 'cancelled'
and (self.move or self.cancel_move or self.number)))
@classmethod
@@ -1137,7 +1143,7 @@
| ((Eval('type') == 'in')
& (Eval('amount_to_pay_today', 0) < 0)),
'danger',
-If(Eval('state') == 'cancel', 'muted', ''))),
+If(Eval('state') == 'cancelled', 'muted', ''))),
]
@classmethod
@@ -1146,7 +1152,7 @@
# Cancel before delete
[tryton-commits] changeset in modules/project_revenue:default Rename invoice stat...
changeset 977e33d3278e in modules/project_revenue:default details: https://hg.tryton.org/modules/project_revenue?cmd=changeset;node=977e33d3278e description: Rename invoice state from cancel to cancelled issue8927 review303661003 diffstat: work.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d3c8da32a3dd -r 977e33d3278e work.py --- a/work.py Mon May 04 12:23:21 2020 +0200 +++ b/work.py Sat Jun 06 10:23:14 2020 +0100 @@ -123,7 +123,7 @@ ).join(invoice, condition=invoice_line.invoice == invoice.id ).select(invoice_line.id, table.id, -where=where & ~invoice.state.in_(['draft', 'cancel']))) +where=where & ~invoice.state.in_(['draft', 'cancelled']))) iline2work.update(cursor.fetchall()) cursor.execute(*table.join(company,
[tryton-commits] changeset in modules/commission:default Rename invoice state fro...
changeset 708202af1348 in modules/commission:default
details:
https://hg.tryton.org/modules/commission?cmd=changeset;node=708202af1348
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
commission.py | 9 +++--
invoice.py| 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diffs (38 lines):
diff -r f8407e3160c4 -r 708202af1348 commission.py
--- a/commission.py Mon Jun 01 10:08:02 2020 +0100
+++ b/commission.py Sat Jun 06 10:23:14 2020 +0100
@@ -327,7 +327,7 @@
('', ''),
('invoiced', 'Invoiced'),
('paid', 'Paid'),
-('cancel', 'Canceled'),
+('cancelled', 'Cancelled'),
], "Invoice State",
help="The current state of the invoice "
"that the commission appears on."),
@@ -381,11 +381,8 @@
if self.invoice_line:
state = 'invoiced'
invoice = self.invoice_line.invoice
-if invoice:
-if invoice.state == 'paid':
-state = 'paid'
-elif invoice.state == 'cancel':
-state = 'cancel'
+if invoice and invoice.state in {'paid', 'cancelled'}:
+state = invoice.state
return state
@classmethod
diff -r f8407e3160c4 -r 708202af1348 invoice.py
--- a/invoice.pyMon Jun 01 10:08:02 2020 +0100
+++ b/invoice.pySat Jun 06 10:23:14 2020 +0100
@@ -70,7 +70,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, invoices):
pool = Pool()
Commission = pool.get('commission')
[tryton-commits] changeset in modules/account_invoice_stock:default Rename invoic...
changeset e894f47e0227 in modules/account_invoice_stock:default
details:
https://hg.tryton.org/modules/account_invoice_stock?cmd=changeset;node=e894f47e0227
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r c97808741669 -r e894f47e0227 stock.py
--- a/stock.py Mon May 04 12:10:04 2020 +0200
+++ b/stock.py Sat Jun 06 10:23:14 2020 +0100
@@ -48,7 +48,7 @@
Uom = pool.get('product.uom')
quantity = 0
for invoice_line in self.invoice_lines:
-if invoice_line.invoice_state != 'cancel':
+if invoice_line.invoice_state != 'cancelled':
quantity += Uom.compute_qty(
invoice_line.unit, invoice_line.quantity, self.uom)
return quantity
[tryton-commits] changeset in modules/analytic_invoice:default Rename invoice sta...
changeset a25be1287a95 in modules/analytic_invoice:default
details:
https://hg.tryton.org/modules/analytic_invoice?cmd=changeset;node=a25be1287a95
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
tests/scenario_analytic_invoice.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (9 lines):
diff -r 0ba6d551b3ec -r a25be1287a95 tests/scenario_analytic_invoice.rst
--- a/tests/scenario_analytic_invoice.rst Mon May 04 12:14:04 2020 +0200
+++ b/tests/scenario_analytic_invoice.rst Sat Jun 06 10:23:14 2020 +0100
@@ -132,4 +132,4 @@
>>> credit.execute('credit')
>>> invoice.reload()
>>> invoice.state
-'cancel'
+'cancelled'
[tryton-commits] changeset in modules/purchase_invoice_line_standalone:default Re...
changeset 96021bf6d0ff in modules/purchase_invoice_line_standalone:default
details:
https://hg.tryton.org/modules/purchase_invoice_line_standalone?cmd=changeset;node=96021bf6d0ff
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
purchase.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r 85225927d38a -r 96021bf6d0ff purchase.py
--- a/purchase.py Mon May 04 12:24:13 2020 +0200
+++ b/purchase.py Sat Jun 06 10:23:14 2020 +0100
@@ -49,7 +49,7 @@
skips = set(x.id for x in self.invoice_lines_ignored)
invoice_lines = [l for l in self.invoice_lines if l.id not in skips]
if invoice_lines:
-if any(l.invoice and l.invoice.state == 'cancel'
+if any(l.invoice and l.invoice.state == 'cancelled'
for l in invoice_lines):
return 'exception'
elif (state == 'paid'
@@ -92,7 +92,7 @@
invoice_lines = []
for invoice_line in purchase.invoice_lines:
if (invoice_line.invoice
-and invoice_line.invoice.state == 'cancel'):
+and invoice_line.invoice.state == 'cancelled'):
invoice_lines.append(invoice_line.id)
if invoice_lines:
Purchase.write([purchase], {
[tryton-commits] changeset in modules/sale_advance_payment:default Rename invoice...
changeset 8a59f2ec9a02 in modules/sale_advance_payment:default
details:
https://hg.tryton.org/modules/sale_advance_payment?cmd=changeset;node=8a59f2ec9a02
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
sale.py | 8
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (35 lines):
diff -r 9c6f56246cc3 -r 8a59f2ec9a02 sale.py
--- a/sale.py Mon May 04 12:25:40 2020 +0200
+++ b/sale.py Sat Jun 06 10:23:14 2020 +0100
@@ -257,12 +257,12 @@
def _get_advance_amount(self):
return sum(l.amount for l in self.invoice_lines
-if l.invoice.state != 'cancel')
+if l.invoice.state != 'cancelled')
def _get_ignored_amount(self):
skips = {l for i in self.sale.invoices_recreated for l in i.lines}
return sum(l.amount for l in self.invoice_lines
-if l.invoice.state == 'cancel' and l not in skips)
+if l.invoice.state == 'cancelled' and l not in skips)
def get_completed(self, name):
advance_amount = 0
@@ -354,7 +354,7 @@
invoices = [i
for i in self.advance_payment_invoices if i.id not in skip_ids]
if invoices:
-if any(i.state == 'cancel' for i in invoices):
+if any(i.state == 'cancelled' for i in invoices):
return 'exception'
elif all(i.state == 'paid' for i in invoices):
return state
@@ -483,6 +483,6 @@
skips = set(sale.invoices_ignored)
skips.update(sale.invoices_recreated)
for invoice in sale.advance_payment_invoices:
-if invoice.state == 'cancel' and invoice not in skips:
+if invoice.state == 'cancelled' and invoice not in skips:
invoices.append(invoice.id)
return default
[tryton-commits] changeset in modules/account_tax_cash:default Rename invoice sta...
changeset eab5842be194 in modules/account_tax_cash:default
details:
https://hg.tryton.org/modules/account_tax_cash?cmd=changeset;node=eab5842be194
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
account.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r c312f17ff3b6 -r eab5842be194 account.py
--- a/account.pyMon May 04 12:13:27 2020 +0200
+++ b/account.pySat Jun 06 10:23:14 2020 +0100
@@ -249,7 +249,7 @@
amount = sum(l.debit - l.credit for l in self.lines_to_pay)
if self.state == 'paid':
ratio = 1
-elif self.state == 'cancel':
+elif self.state == 'cancelled':
ratio = 0
else:
payment_amount = sum(
@@ -284,7 +284,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, invoices):
super(Invoice, cls).cancel(invoices)
cls._update_tax_cash_basis(invoices)
[tryton-commits] changeset in modules/purchase:default Rename invoice state from ...
changeset cef216d5e21b in modules/purchase:default
details: https://hg.tryton.org/modules/purchase?cmd=changeset;node=cef216d5e21b
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
invoice.py | 2 +-
purchase.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 207468844fc1 -r cef216d5e21b invoice.py
--- a/invoice.pySat Jun 06 10:17:29 2020 +0100
+++ b/invoice.pySat Jun 06 10:23:14 2020 +0100
@@ -79,7 +79,7 @@
@Workflow.transition('draft')
def draft(cls, invoices):
for invoice in invoices:
-if invoice.purchases and invoice.state == 'cancel':
+if invoice.purchases and invoice.state == 'cancelled':
raise AccessError(
gettext('purchase.msg_purchase_invoice_reset_draft',
invoice=invoice.rec_name))
diff -r 207468844fc1 -r cef216d5e21b purchase.py
--- a/purchase.py Sat Jun 06 10:17:29 2020 +0100
+++ b/purchase.py Sat Jun 06 10:23:14 2020 +0100
@@ -573,7 +573,7 @@
skip_ids.update(x.id for x in self.invoices_recreated)
invoices = [i for i in self.invoices if i.id not in skip_ids]
if invoices:
-if any(i.state == 'cancel' for i in invoices):
+if any(i.state == 'cancelled' for i in invoices):
return 'exception'
elif all(i.state == 'paid' for i in invoices):
return 'paid'
@@ -1644,7 +1644,7 @@
invoiced_quantity = 0
for invoice_line in self.invoice_lines:
if (not invoice_line.invoice
-or invoice_line.invoice.state != 'cancel'):
+or invoice_line.invoice.state != 'cancelled'):
invoiced_quantity += Uom.compute_qty(
invoice_line.unit, invoice_line.quantity, self.unit)
self.actual_quantity = max(moved_quantity, invoiced_quantity, key=abs)
@@ -1876,7 +1876,7 @@
skip.update(purchase.invoices_recreated)
invoices = []
for invoice in purchase.invoices:
-if invoice.state == 'cancel' and invoice not in skip:
+if invoice.state == 'cancelled' and invoice not in skip:
invoices.append(invoice.id)
return {
'recreate_invoices': invoices,
[tryton-commits] changeset in modules/sale:default Rename invoice state from canc...
changeset 8958400808a1 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=8958400808a1
description:
Rename invoice state from cancel to cancelled
issue8927
review303661003
diffstat:
invoice.py | 2 +-
sale.py| 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 357ea6c5aa97 -r 8958400808a1 invoice.py
--- a/invoice.pySat Jun 06 10:17:30 2020 +0100
+++ b/invoice.pySat Jun 06 10:23:14 2020 +0100
@@ -92,7 +92,7 @@
@Workflow.transition('draft')
def draft(cls, invoices):
for invoice in invoices:
-if invoice.sales and invoice.state == 'cancel':
+if invoice.sales and invoice.state == 'cancelled':
raise AccessError(
gettext('sale.msg_sale_invoice_reset_draft',
invoice=invoice.rec_name))
diff -r 357ea6c5aa97 -r 8958400808a1 sale.py
--- a/sale.py Sat Jun 06 10:17:30 2020 +0100
+++ b/sale.py Sat Jun 06 10:23:14 2020 +0100
@@ -555,7 +555,7 @@
skip_ids.update(x.id for x in self.invoices_recreated)
invoices = [i for i in self.invoices if i.id not in skip_ids]
if invoices:
-if any(i.state == 'cancel' for i in invoices):
+if any(i.state == 'cancelled' for i in invoices):
return 'exception'
elif all(i.state == 'paid' for i in invoices):
return 'paid'
@@ -1615,7 +1615,7 @@
invoiced_quantity = 0
for invoice_line in self.invoice_lines:
if (not invoice_line.invoice
-or invoice_line.invoice.state != 'cancel'):
+or invoice_line.invoice.state != 'cancelled'):
invoiced_quantity += Uom.compute_qty(
invoice_line.unit, invoice_line.quantity, self.unit)
self.actual_quantity = max(moved_quantity, invoiced_quantity, key=abs)
@@ -1839,7 +1839,7 @@
skips.update(sale.invoices_recreated)
invoices = []
for invoice in sale.invoices:
-if invoice.state == 'cancel' and invoice not in skips:
+if invoice.state == 'cancelled' and invoice not in skips:
invoices.append(invoice.id)
return {
'recreate_invoices': invoices,
[tryton-commits] changeset in modules/sale_supply_drop_shipment:default Rename dr...
changeset 857ff37a0a2c in modules/sale_supply_drop_shipment:default
details:
https://hg.tryton.org/modules/sale_supply_drop_shipment?cmd=changeset;node=857ff37a0a2c
description:
Rename drop shipment state from cancel to cancelled
issue8927
review321401002
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 2 +-
party.py | 2 +-
stock.py | 28 +---
4 files changed, 21 insertions(+), 13 deletions(-)
diffs (120 lines):
diff -r e6bb918f7d08 -r 857ff37a0a2c CHANGELOG
--- a/CHANGELOG Fri May 22 11:49:35 2020 +0200
+++ b/CHANGELOG Thu Jun 04 11:05:27 2020 +0100
@@ -1,3 +1,5 @@
+* Rename drop shipment state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
diff -r e6bb918f7d08 -r 857ff37a0a2c doc/index.rst
--- a/doc/index.rst Fri May 22 11:49:35 2020 +0200
+++ b/doc/index.rst Thu Jun 04 11:05:27 2020 +0100
@@ -33,6 +33,6 @@
All moves are in state Done.
-* Cancel
+* Cancelled
All moves are cancelled.
diff -r e6bb918f7d08 -r 857ff37a0a2c party.py
--- a/party.py Fri May 22 11:49:35 2020 +0200
+++ b/party.py Thu Jun 04 11:05:27 2020 +0100
@@ -33,7 +33,7 @@
('customer', '=', party.id),
],
('company', '=', company.id),
-('state', 'not in', ['done', 'cancel']),
+('state', 'not in', ['done', 'cancelled']),
])
if shipments:
raise EraseError(
diff -r e6bb918f7d08 -r 857ff37a0a2c stock.py
--- a/stock.py Fri May 22 11:49:35 2020 +0200
+++ b/stock.py Thu Jun 04 11:05:27 2020 +0100
@@ -152,7 +152,7 @@
'Supplier Moves',
filter=[('to_location.type', '=', 'drop')],
states={
-'readonly': Eval('state').in_(['shipped', 'done', 'cancel']),
+'readonly': Eval('state').in_(['shipped', 'done', 'cancelled']),
},
depends=['state', 'supplier'])
customer_moves = fields.One2Many('stock.move', 'shipment',
@@ -168,7 +168,7 @@
('waiting', 'Waiting'),
('shipped', 'Shipped'),
('done', 'Done'),
-('cancel', 'Canceled'),
+('cancelled', 'Cancelled'),
], 'State', readonly=True)
@classmethod
@@ -179,6 +179,7 @@
PurchaseRequest = pool.get('purchase.request')
SaleLine = pool.get('sale.line')
Location = pool.get('stock.location')
+table = cls.__table__()
move = Move.__table__()
purchase_line = PurchaseLine.__table__()
purchase_request = PurchaseRequest.__table__()
@@ -238,28 +239,33 @@
drop_shipment_location, customer_location],
where=(move.id == move_id)))
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*table.update(
+[table.state], ['cancelled'],
+where=table.state == 'cancel'))
+
@classmethod
def __setup__(cls):
super(ShipmentDrop, cls).__setup__()
cls._transitions |= set((
('draft', 'waiting'),
('waiting', 'shipped'),
-('draft', 'cancel'),
-('waiting', 'cancel'),
+('draft', 'cancelled'),
+('waiting', 'cancelled'),
('waiting', 'draft'),
-('cancel', 'draft'),
+('cancelled', 'draft'),
('shipped', 'done'),
-('shipped', 'cancel'),
+('shipped', 'cancelled'),
))
cls._buttons.update({
'cancel': {
-'invisible': Eval('state').in_(['cancel', 'done']),
+'invisible': Eval('state').in_(['cancelled', 'done']),
'depends': ['state'],
},
'draft': {
-'invisible': ~Eval('state').in_(['cancel', 'draft',
+'invisible': ~Eval('state').in_(['cancelled', 'draft',
'waiting']),
-'icon': If(Eval('state') == 'cancel',
+'icon': If(Eval('state') == 'cancelled',
'tryton-undo', 'tryton-back'),
'depends': ['state'],
},
@@ -356,7 +362,7 @@
cls.cancel(shipments)
for shipment in shipments:
-if shipment.state != 'cancel':
+if shipment.state != 'cancelled':
raise AccessError(
gettext('sale_supply_drop_shipment'
'.msg_drop_shipment_delete_cancel') % {
@@ -367,7 +373,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
@process_sale('customer_moves')
@process_purchase('supplier_moves')
def cancel(cls, shipments):
[tryton-commits] changeset in modules/stock:default Rename inventory state from c...
changeset 7d936a1b8de2 in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=7d936a1b8de2
description:
Rename inventory state from cancel to cancelled
issue8927
review319561002
diffstat:
CHANGELOG| 1 +
inventory.py | 23 +++
2 files changed, 16 insertions(+), 8 deletions(-)
diffs (97 lines):
diff -r cc8431eaf363 -r 7d936a1b8de2 CHANGELOG
--- a/CHANGELOG Mon Jun 01 10:08:02 2020 +0100
+++ b/CHANGELOG Thu Jun 04 11:08:53 2020 +0100
@@ -1,3 +1,4 @@
+* Rename inventory state from cancel to cancelled
* Override warehouse with context value for current user
Version 5.6.0 - 2020-05-04
diff -r cc8431eaf363 -r 7d936a1b8de2 inventory.py
--- a/inventory.py Mon Jun 01 10:08:02 2020 +0100
+++ b/inventory.py Thu Jun 04 11:08:53 2020 +0100
@@ -59,7 +59,7 @@
state = fields.Selection([
('draft', "Draft"),
('done', "Done"),
-('cancel', "Canceled"),
+('cancelled', "Cancelled"),
], "State", readonly=True, select=True,
help="The current state of the inventory.")
@@ -71,15 +71,15 @@
cls._order.insert(0, ('date', 'DESC'))
cls._transitions |= set((
('draft', 'done'),
-('draft', 'cancel'),
+('draft', 'cancelled'),
))
cls._buttons.update({
'confirm': {
-'invisible': Eval('state').in_(['done', 'cancel']),
+'invisible': Eval('state').in_(['done', 'cancelled']),
'depends': ['state'],
},
'cancel': {
-'invisible': Eval('state').in_(['cancel', 'done']),
+'invisible': Eval('state').in_(['cancelled', 'done']),
'depends': ['state'],
},
'complete_lines': {
@@ -96,7 +96,9 @@
def __register__(cls, module_name):
super(Inventory, cls).__register__(module_name)
+cursor = Transaction().connection.cursor()
table = cls.__table_handler__(module_name)
+sql_table = cls.__table__()
# Add index on create_date
table.index_action('create_date', action='add')
@@ -104,6 +106,11 @@
# Migration from 5.4: remove lost_found
table.not_null_action('lost_found', 'remove')
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*sql_table.update(
+[sql_table.state], ['cancelled'],
+where=sql_table.state == 'cancel'))
+
@staticmethod
def default_state():
return 'draft'
@@ -120,7 +127,7 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
@@ -128,7 +135,7 @@
# Cancel before delete
cls.cancel(inventories)
for inventory in inventories:
-if inventory.state != 'cancel':
+if inventory.state != 'cancelled':
raise AccessError(
gettext('stock.msg_inventory_delete_cancel',
inventory=inventory.rec_name))
@@ -159,7 +166,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, inventories):
Line = Pool().get("stock.inventory.line")
Line.cancel_move([l for i in inventories for l in i.lines])
@@ -482,7 +489,7 @@
@classmethod
def delete(cls, lines):
for line in lines:
-if line.inventory_state not in {'cancel', 'draft'}:
+if line.inventory_state not in {'cancelled', 'draft'}:
raise AccessError(
gettext('stock.msg_inventory_line_delete_cancel',
line=line.rec_name,
[tryton-commits] changeset in modules/purchase_request_quotation:default Use undo...
changeset 41fc18e2af7f in modules/purchase_request_quotation:default
details:
https://hg.tryton.org/modules/purchase_request_quotation?cmd=changeset;node=41fc18e2af7f
description:
Use undo icon on draft button for cancelled quotations
issue9367
review321381002
diffstat:
purchase.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 0088e97fff75 -r 41fc18e2af7f purchase.py
--- a/purchase.py Mon May 04 12:24:37 2020 +0200
+++ b/purchase.py Thu Jun 04 10:45:52 2020 +0100
@@ -139,7 +139,7 @@
},
'draft': {
'invisible': ~Eval('state').in_(['cancelled', 'sent']),
-'icon': If(Eval('state') == 'cancel',
+'icon': If(Eval('state') == 'cancelled',
'tryton-undo',
'tryton-back'),
},
[tryton-commits] changeset in modules/account_stock_landed_cost:default Rename ca...
changeset 68946c509368 in modules/account_stock_landed_cost:default
details:
https://hg.tryton.org/modules/account_stock_landed_cost?cmd=changeset;node=68946c509368
description:
Rename cancel state to cancelled
issue8927
review291801003
diffstat:
CHANGELOG | 2 ++
account.py | 17 -
2 files changed, 14 insertions(+), 5 deletions(-)
diffs (72 lines):
diff -r 0b9bfec73fca -r 68946c509368 CHANGELOG
--- a/CHANGELOG Mon May 04 12:13:03 2020 +0200
+++ b/CHANGELOG Thu Jun 04 10:56:46 2020 +0100
@@ -1,3 +1,5 @@
+* Rename landed cost state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
diff -r 0b9bfec73fca -r 68946c509368 account.py
--- a/account.pyMon May 04 12:13:03 2020 +0200
+++ b/account.pyThu Jun 04 10:56:46 2020 +0100
@@ -115,7 +115,7 @@
state = fields.Selection([
('draft', 'Draft'),
('posted', 'Posted'),
-('cancel', 'Canceled'),
+('cancelled', 'Cancelled'),
], 'State', readonly=True)
@classmethod
@@ -128,8 +128,8 @@
]
cls._transitions |= set((
('draft', 'posted'),
-('draft', 'cancel'),
-('cancel', 'draft'),
+('draft', 'cancelled'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -137,7 +137,7 @@
'depends': ['state'],
},
'draft': {
-'invisible': Eval('state') != 'cancel',
+'invisible': Eval('state') != 'cancelled',
'depends': ['state'],
},
'post': {
@@ -148,7 +148,9 @@
@classmethod
def __register__(cls, module_name):
+cursor = Transaction().connection.cursor()
table_h = cls.__table_handler__(module_name)
+sql_table = cls.__table__()
# Migration from 3.8: rename code into number
if table_h.column_exist('code'):
@@ -156,6 +158,11 @@
super(LandedCost, cls).__register__(module_name)
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*sql_table.update(
+[sql_table.state], ['cancelled'],
+where=sql_table.state == 'cancel'))
+
@staticmethod
def default_company():
return Transaction().context.get('company')
@@ -170,7 +177,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, landed_costs):
pass
[tryton-commits] changeset in modules/stock_forecast:default Rename forecast stat...
changeset 062abe7fd21b in modules/stock_forecast:default
details:
https://hg.tryton.org/modules/stock_forecast?cmd=changeset;node=062abe7fd21b
description:
Rename forecast state from cancel to cancelled
issue8927
review323371002
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 2 +-
forecast.py | 18 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diffs (85 lines):
diff -r 462e2d72e9e6 -r 062abe7fd21b CHANGELOG
--- a/CHANGELOG Mon May 04 12:30:54 2020 +0200
+++ b/CHANGELOG Thu Jun 04 11:01:07 2020 +0100
@@ -1,3 +1,5 @@
+* Rename forecast state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
diff -r 462e2d72e9e6 -r 062abe7fd21b doc/index.rst
--- a/doc/index.rst Mon May 04 12:30:54 2020 +0200
+++ b/doc/index.rst Thu Jun 04 11:01:07 2020 +0100
@@ -46,7 +46,7 @@
- Move quantities are bigger or equal to the minimal quantity set
on the forecast line.
-Cancel
+Cancelled
On a cancelled forecast all existing moves are cancelled and the form
is readonly.
diff -r 462e2d72e9e6 -r 062abe7fd21b forecast.py
--- a/forecast.py Mon May 04 12:30:54 2020 +0200
+++ b/forecast.py Thu Jun 04 11:01:07 2020 +0100
@@ -61,7 +61,7 @@
state = fields.Selection([
('draft', "Draft"),
('done', "Done"),
-('cancel', "Cancel"),
+('cancelled', "Cancelled"),
], "State", readonly=True, select=True)
active = fields.Function(fields.Boolean('Active'),
'get_active', searcher='search_active')
@@ -75,9 +75,9 @@
cls._order.insert(1, ('warehouse', 'ASC'))
cls._transitions |= set((
('draft', 'done'),
-('draft', 'cancel'),
+('draft', 'cancelled'),
('done', 'draft'),
-('cancel', 'draft'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'cancel': {
@@ -101,6 +101,9 @@
@classmethod
def __register__(cls, module_name):
+cursor = Transaction().connection.cursor()
+sql_table = cls.__table__()
+
super(Forecast, cls).__register__(module_name)
# Add index on create_date
@@ -110,6 +113,11 @@
# Migration from 5.0: remove check_from_to_date
table.drop_constraint('check_from_to_date')
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*sql_table.update(
+[sql_table.state], ['cancelled'],
+where=sql_table.state == 'cancel'))
+
@staticmethod
def default_state():
return 'draft'
@@ -197,7 +205,7 @@
# Cancel before delete
cls.cancel(forecasts)
for forecast in forecasts:
-if forecast.state != 'cancel':
+if forecast.state != 'cancelled':
raise AccessError(
gettext('stock_forecast.msg_forecast_delete_cancel',
forecast=forecast.rec_name))
@@ -217,7 +225,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, forecasts):
pass
[tryton-commits] changeset in modules/purchase_requisition:default Rename purchas...
changeset 4650f85e3897 in modules/purchase_requisition:default
details:
https://hg.tryton.org/modules/purchase_requisition?cmd=changeset;node=4650f85e3897
description:
Rename purchase requisition state from cancel to cancelled
issue8927
review325441002
diffstat:
CHANGELOG | 2 +
doc/index.rst | 2 +-
purchase.py | 37 ++--
tests/scenario_purchase_requisition.rst | 2 +-
4 files changed, 29 insertions(+), 14 deletions(-)
diffs (136 lines):
diff -r a69ba5943155 -r 4650f85e3897 CHANGELOG
--- a/CHANGELOG Mon May 04 12:24:49 2020 +0200
+++ b/CHANGELOG Thu Jun 04 11:07:28 2020 +0100
@@ -1,3 +1,5 @@
+* Rename purchase requisition state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Add employee on requisitions for some states
diff -r a69ba5943155 -r 4650f85e3897 doc/index.rst
--- a/doc/index.rst Mon May 04 12:24:49 2020 +0200
+++ b/doc/index.rst Thu Jun 04 11:07:28 2020 +0100
@@ -28,5 +28,5 @@
- Total: The total amount.
- State: The state of the purchase requisition. May take one of the following
- values: Draft, Waiting, Rejected, Processing, Done, Canceled.
+ values: Draft, Waiting, Rejected, Processing, Done, Cancelled.
- Company: The company which issue the purchase requisition.
diff -r a69ba5943155 -r 4650f85e3897 purchase.py
--- a/purchase.py Mon May 04 12:24:49 2020 +0200
+++ b/purchase.py Thu Jun 04 11:07:28 2020 +0100
@@ -110,7 +110,7 @@
supply_date = fields.Date(
'Supply Date',
states={
-'required': ~Eval('state').in_(['draft', 'cancel']),
+'required': ~Eval('state').in_(['draft', 'cancelled']),
'readonly': _states['readonly'],
},
depends=_depends)
@@ -141,9 +141,9 @@
states=_states, depends=_depends)
approved_by = employee_field(
-"Approved By", states=['approved', 'processing', 'done', 'cancel'])
+"Approved By", states=['approved', 'processing', 'done', 'cancelled'])
rejected_by = employee_field(
-"Rejected By", states=['rejected', 'processing', 'done', 'cancel'])
+"Rejected By", states=['rejected', 'processing', 'done', 'cancelled'])
state = fields.Selection([
('draft', "Draft"),
('waiting', "Waiting"),
@@ -151,7 +151,7 @@
('approved', "Approved"),
('processing', "Processing"),
('done', "Done"),
-('cancel', "Canceled"),
+('cancelled', "Cancelled"),
], "State", readonly=True, required=True)
del _states
@@ -160,9 +160,9 @@
def __setup__(cls):
super(PurchaseRequisition, cls).__setup__()
cls._transitions |= set((
-('cancel', 'draft'),
+('cancelled', 'draft'),
('rejected', 'draft'),
-('draft', 'cancel'),
+('draft', 'cancelled'),
('draft', 'waiting'),
('waiting', 'draft'),
('waiting', 'rejected'),
@@ -179,8 +179,8 @@
},
'draft': {
'invisible': ~Eval('state').in_(
-['cancel', 'waiting', 'approved', 'rejected']),
-'icon': If(Eval('state').in_(['cancel', 'rejected']),
+['cancelled', 'waiting', 'approved', 'rejected']),
+'icon': If(Eval('state').in_(['cancelled', 'rejected']),
'tryton-undo',
'tryton-back'),
'depends': ['state'],
@@ -210,7 +210,19 @@
})
# The states where amounts are cached
cls._states_cached = ['approved', 'done', 'rejected',
-'processing', 'cancel']
+'processing', 'cancelled']
+
+@classmethod
+def __register__(cls, module_name):
+cursor = Transaction().connection.cursor()
+table = cls.__table__()
+
+super().__register__(module_name)
+
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*table.update(
+[table.state], ['cancelled'],
+where=table.state == 'cancel'))
@classmethod
def default_state(cls):
@@ -300,7 +312,8 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual',
+If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
@@ -322,7 +335,7 @@
# Cancel before delete
cls.cancel(requisitions)
for requisition in requisitions:
-if requisition.state != 'cancel':
+if requisition.state != 'cancelled':
raise AccessError(
[tryton-commits] changeset in modules/account_statement:default Rename statement ...
changeset 25fb3e3dee84 in modules/account_statement:default
details:
https://hg.tryton.org/modules/account_statement?cmd=changeset;node=25fb3e3dee84
description:
Rename statement state from cancel to cancelled
issue8927
review309681006
diffstat:
CHANGELOG| 2 ++
doc/index.rst| 4 ++--
statement.fodt | 4 ++--
statement.py | 23 ++-
tests/scenario_account_statement.rst | 2 +-
5 files changed, 21 insertions(+), 14 deletions(-)
diffs (129 lines):
diff -r c01a24c5b93e -r 25fb3e3dee84 CHANGELOG
--- a/CHANGELOG Mon May 04 12:11:36 2020 +0200
+++ b/CHANGELOG Thu Jun 04 11:11:01 2020 +0100
@@ -1,3 +1,5 @@
+* Rename statement state from cancel to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Prevent posting move from statement that is not posted
diff -r c01a24c5b93e -r 25fb3e3dee84 doc/index.rst
--- a/doc/index.rst Mon May 04 12:11:36 2020 +0200
+++ b/doc/index.rst Thu Jun 04 11:11:01 2020 +0100
@@ -29,9 +29,9 @@
The statement is posted which means all the moves have been posted.
-* Canceled
+* Cancelled
- The statement is canceled which means all the moves previously created have
+ The statement is cancelled which means all the moves previously created have
been deleted.
Line
diff -r c01a24c5b93e -r 25fb3e3dee84 statement.fodt
--- a/statement.fodtMon May 04 12:11:36 2020 +0200
+++ b/statement.fodtThu Jun 04 11:11:01 2020 +0100
@@ -474,8 +474,8 @@
when test=statement.state ==
draft
Draft
Statement
/when
- when test=statement.state ==
canceled
- Canceled
Statement
+ when test=statement.state ==
cancelled
+ Cancelled
Statement
/when
otherwise
Statement
diff -r c01a24c5b93e -r 25fb3e3dee84 statement.py
--- a/statement.py Mon May 04 12:11:36 2020 +0200
+++ b/statement.py Thu Jun 04 11:11:01 2020 +0100
@@ -123,7 +123,7 @@
state = fields.Selection([
('draft', "Draft"),
('validated', "Validated"),
-('cancel', "Canceled"),
+('cancelled', "Cancelled"),
('posted', "Posted"),
], "State", readonly=True, select=True)
validation = fields.Function(fields.Char('Validation'),
@@ -142,14 +142,14 @@
cls._order[0] = ('id', 'DESC')
cls._transitions |= set((
('draft', 'validated'),
-('draft', 'cancel'),
+('draft', 'cancelled'),
('validated', 'posted'),
-('validated', 'cancel'),
-('cancel', 'draft'),
+('validated', 'cancelled'),
+('cancelled', 'draft'),
))
cls._buttons.update({
'draft': {
-'invisible': Eval('state') != 'cancel',
+'invisible': Eval('state') != 'cancelled',
'depends': ['state'],
},
'validate_statement': {
@@ -165,7 +165,7 @@
'depends': ['state'],
},
'reconcile': {
-'invisible': Eval('state').in_(['draft', 'cancel']),
+'invisible': Eval('state').in_(['draft', 'cancelled']),
'readonly': ~Eval('to_reconcile'),
'depends': ['state', 'to_reconcile'],
},
@@ -193,6 +193,11 @@
[sql_table.id.cast(cls.name.sql_type().base)],
where=sql_table.name == Null))
+# Migration from 5.6: rename state cancel to cancelled
+cursor.execute(*sql_table.update(
+[sql_table.state], ['cancelled'],
+where=sql_table.state == 'cancel'))
+
@staticmethod
def default_company():
return Transaction().context.get('company')
@@ -412,7 +417,7 @@
@classmethod
def view_attributes(cls):
return [
-('/tree', 'visual', If(Eval('state') == 'cancel', 'muted', '')),
+('/tree', 'visual', If(Eval('state') == 'cancelled', 'muted', '')),
]
@classmethod
@@ -420,7 +425,7 @@
# Cancel before delete
cls.cancel(statements)
for statement in statements:
-if statement.state != 'cancel':
+if statement.state != 'cancelled':
raise AccessError(
gettext('account_statement.msg_statement_delete_cancel',
statement=statement.rec_name))
@@ -631,7 +636,7 @@
@classmethod
@ModelView.button
-@Workflow.transition('cancel')
+@Workflow.transition('cancelled')
def cancel(cls, statements):
StatementLine = Pool().get('account.statement.line')
diff -r c01a24c5b93e -r 25fb3e3dee84 tests/scenario_account_statement.rst
--- a/tests/scenario_account_statement.rst Mon May 04 12:11:36 2020
[tryton-commits] changeset in modules/account_payment_sepa:default Rename cancele...
changeset f47885505714 in modules/account_payment_sepa:default
details:
https://hg.tryton.org/modules/account_payment_sepa?cmd=changeset;node=f47885505714
description:
Rename canceled states to cancelled
issue8927
review317461003
diffstat:
CHANGELOG | 2 ++
doc/index.rst | 4 ++--
message.xml | 2 +-
payment.py| 53 +++--
payment.xml | 6 +++---
5 files changed, 43 insertions(+), 24 deletions(-)
diffs (226 lines):
diff -r 7140231ac33e -r f47885505714 CHANGELOG
--- a/CHANGELOG Mon May 04 12:10:44 2020 +0200
+++ b/CHANGELOG Thu Jun 04 11:13:25 2020 +0100
@@ -1,3 +1,5 @@
+* Rename mandate and message states from canceled to cancelled
+
Version 5.6.0 - 2020-05-04
* Bug fixes (see mercurial logs for details)
* Merge sepa identifier into eu_at_02
diff -r 7140231ac33e -r f47885505714 doc/index.rst
--- a/doc/index.rst Mon May 04 12:10:44 2020 +0200
+++ b/doc/index.rst Thu Jun 04 11:13:25 2020 +0100
@@ -56,7 +56,7 @@
* Draft
* Requested
* Validated
-* Canceled
+* Cancelled
Message
***
@@ -68,7 +68,7 @@
* Draft
* Waiting
* Done
-* Canceled
+* Cancelled
Bank to Customer Debit Credit Notification (camt.054)
-
diff -r 7140231ac33e -r f47885505714 message.xml
--- a/message.xml Mon May 04 12:10:44 2020 +0200
+++ b/message.xml Thu Jun 04 11:13:25 2020 +0100
@@ -12,7 +12,7 @@
SEPA mandate identification must be unique by
company.
-
+
To delete mandate "%(mandate)s" you must cancel
it or reset its state to draft.
diff -r 7140231ac33e -r f47885505714 payment.py
--- a/payment.pyMon May 04 12:10:44 2020 +0200
+++ b/payment.pyThu Jun 04 11:13:25 2020 +0100
@@ -403,13 +403,13 @@
party = fields.Many2One('party.party', 'Party', required=True, select=True,
states={
'readonly': Eval('state').in_(
-['requested', 'validated', 'canceled']),
+['requested', 'validated', 'cancelled']),
},
depends=['state'])
account_number = fields.Many2One('bank.account.number', 'Account Number',
ondelete='RESTRICT',
states={
-'readonly': Eval('state').in_(['validated', 'canceled']),
+'readonly': Eval('state').in_(['validated', 'cancelled']),
'required': Eval('state') == 'validated',
},
domain=[
@@ -440,7 +440,7 @@
('one-off', 'One-off'),
], 'Type',
states={
-'readonly': Eval('state').in_(['validated', 'canceled']),
+'readonly': Eval('state').in_(['validated', 'cancelled']),
},
depends=['state'])
sequence_type_rcur = fields.Boolean(
@@ -454,13 +454,13 @@
('B2B', 'Business to Business'),
], 'Scheme', required=True,
states={
-'readonly': Eval('state').in_(['validated', 'canceled']),
+'readonly': Eval('state').in_(['validated', 'cancelled']),
},
depends=['state'])
scheme_string = scheme.translated('scheme')
signature_date = fields.Date('Signature Date',
states={
-'readonly': Eval('state').in_(['validated', 'canceled']),
+'readonly': Eval('state').in_(['validated', 'cancelled']),
'required': Eval('state') == 'validated',
},
depends=['state'])
@@ -468,7 +468,7 @@
('draft', 'Draft'),
('requested', 'Requested'),
('validated', 'Validated'),
-('canceled', 'Canceled'),
+('cancelled', 'Cancelled'),
], 'State', readonly=True)
payments = fields.One2Many('account.payment', 'sepa_mandate', 'Payments')
has_payments = fields.Function(fields.Boolean('Has Payments'),
@@ -480,8 +480,8 @@
cls._transitions |= set((
('draft', 'requested'),
('requested', 'validated'),
-('validated', 'canceled'),
-('requested', 'canceled'),
+('validated', 'cancelled'),
+('requested', 'cancelled'),
('requested', 'draft'),
))
cls._buttons.update({
@@ -509,6 +509,18 @@
'account_payment_sepa.msg_mandate_unique_id'),
]
+@classmethod
+def __register__(cls, module_name):
+cursor = Transaction().connection.cursor()
+table = cls.__table__()
+
+super().__register__(module_name)
+
+# Migration from 5.6: rename state canceled to cancelled
+cursor.execute(*table.update(
+[table.state], ['cancelled'],
+where=table.state == 'canceled'))
+
@staticmethod
def default_company():
return Transaction().context.get('company')
@@ -658,18 +670,18 @@
@classmethod
[tryton-commits] changeset in modules/stock_secondary_unit:default Change cancel ...
changeset 2acf4718577d in modules/stock_secondary_unit:default
details:
https://hg.tryton.org/modules/stock_secondary_unit?cmd=changeset;node=2acf4718577d
description:
Change cancel and canceled states to cancelled
issue8927
review303751003
diffstat:
stock.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 7607b786d709 -r 2acf4718577d stock.py
--- a/stock.py Sat Jun 06 10:30:12 2020 +0100
+++ b/stock.py Sun Jun 07 09:35:40 2020 +0100
@@ -27,7 +27,7 @@
],
states={
'invisible': ~Eval('product_secondary_uom_category'),
-'readonly': Eval('state').in_(['cancel', 'assigned', 'done']),
+'readonly': Eval('state').in_(['cancelled', 'assigned', 'done']),
},
depends=['product_secondary_uom_category', 'state'])
secondary_unit_price = fields.Function(
[tryton-commits] changeset in modules/account_es:default Change cancel and cancel...
changeset 5f00d8ac5537 in modules/account_es:default
details:
https://hg.tryton.org/modules/account_es?cmd=changeset;node=5f00d8ac5537
description:
Change cancel and canceled states to cancelled
issue8927
review303751003
diffstat:
tests/scenario_reporting_cancelled_invoices.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (21 lines):
diff -r 999f07193e51 -r 5f00d8ac5537
tests/scenario_reporting_cancelled_invoices.rst
--- a/tests/scenario_reporting_cancelled_invoices.rst Mon May 04 12:08:08
2020 +0200
+++ b/tests/scenario_reporting_cancelled_invoices.rst Sun Jun 07 09:35:40
2020 +0100
@@ -110,7 +110,7 @@
>>> credit.execute('credit')
>>> invoice.reload()
>>> invoice.state
-'cancel'
+'cancelled'
VAT List is empty::
@@ -139,7 +139,7 @@
>>> invoice.click('cancel')
>>> invoice.state
-'cancel'
+'cancelled'
>>> with config.set_context(context):
... vat_list_records = VatList.find([])
>>> len(vat_list_records)
[tryton-commits] changeset in modules/sale_subscription:default Change cancel and...
changeset 690802522756 in modules/sale_subscription:default details: https://hg.tryton.org/modules/sale_subscription?cmd=changeset;node=690802522756 description: Change cancel and canceled states to cancelled issue8927 review303751003 diffstat: subscription.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 1908ed00325e -r 690802522756 subscription.xml --- a/subscription.xml Sat Jun 06 09:58:15 2020 +0100 +++ b/subscription.xml Sun Jun 07 09:35:40 2020 +0100 @@ -81,7 +81,7 @@ - +
[tryton-commits] changeset in modules/stock_consignment:default Change cancel and...
changeset 741adc77dd03 in modules/stock_consignment:default
details:
https://hg.tryton.org/modules/stock_consignment?cmd=changeset;node=741adc77dd03
description:
Change cancel and canceled states to cancelled
issue8927
review303751003
diffstat:
tests/scenario_stock_consignment.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 6e18d398da51 -r 741adc77dd03 tests/scenario_stock_consignment.rst
--- a/tests/scenario_stock_consignment.rst Sat Jun 06 10:30:11 2020 +0100
+++ b/tests/scenario_stock_consignment.rst Sun Jun 07 09:35:40 2020 +0100
@@ -275,7 +275,7 @@
True
>>> shipment.click('cancel')
>>> shipment.state
-'cancel'
+'cancelled'
>>> move, = shipment.moves
>>> bool(move.origin)
False
[tryton-commits] changeset in modules/account_invoice:default Change cancel and c...
changeset c9b8fe3441a0 in modules/account_invoice:default details: https://hg.tryton.org/modules/account_invoice?cmd=changeset;node=c9b8fe3441a0 description: Change cancel and canceled states to cancelled issue8927 review303751003 diffstat: party.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c03842e8190a -r c9b8fe3441a0 party.xml --- a/party.xml Sat Jun 06 10:23:14 2020 +0100 +++ b/party.xml Sun Jun 07 09:35:40 2020 +0100 @@ -48,7 +48,7 @@ - +
[tryton-commits] changeset in readthedocs:default Correct spelling of consignment
changeset 40b104540e56 in readthedocs:default details: https://hg.tryton.org/readthedocs?cmd=changeset;node=40b104540e56 description: Correct spelling of consignment diffstat: stock.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d07f1bad221e -r 40b104540e56 stock.rst --- a/stock.rst Sat May 30 10:15:22 2020 +0200 +++ b/stock.rst Thu Jul 16 10:26:50 2020 +0100 @@ -8,7 +8,7 @@ `Stock `_ Fundamentals to manage warehouses. -`Consignemt `_ +`Consignment `_ Manages consignment stock from supplier or at customer warehouse. `Forecast `_
[tryton-commits] changeset in cookiecutter:default Strip toctree using a regular ...
changeset 41ffe478a57d in cookiecutter:default
details: https://hg.tryton.org/cookiecutter?cmd=changeset;node=41ffe478a57d
description:
Strip toctree using a regular expression
issue9783
review314741002
diffstat:
{{ cookiecutter.module_name }}/setup.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (19 lines):
diff -r c2dae72fd267 -r 41ffe478a57d {{ cookiecutter.module_name }}/setup.py
--- a/{{ cookiecutter.module_name }}/setup.py Sat Dec 05 14:23:34 2020 +
+++ b/{{ cookiecutter.module_name }}/setup.py Sat Dec 05 14:24:50 2020 +
@@ -15,12 +15,12 @@
{%- endif %}
-def read(fname, slice=None):
+def read(fname):
content = io.open(
os.path.join(os.path.dirname(__file__), fname),
'r', encoding='utf-8').read()
-if slice:
-content = '\n'.join(content.splitlines()[slice])
+content = re.sub(
+r'(?m)^\.\. toctree::\r?\n((^$|^\s.*$)\r?\n)*', '', content)
return content
[tryton-commits] changeset in cookiecutter:default Test long_description using tw...
changeset c2dae72fd267 in cookiecutter:default
details: https://hg.tryton.org/cookiecutter?cmd=changeset;node=c2dae72fd267
description:
Test long_description using twine check
issue9781
review306841002
diffstat:
{{ cookiecutter.module_name }}/.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r d0ea46dd2440 -r c2dae72fd267 {{ cookiecutter.module_name }}/.drone.yml
--- a/{{ cookiecutter.module_name }}/.drone.yml Fri Oct 30 15:15:41 2020 +0100
+++ b/{{ cookiecutter.module_name }}/.drone.yml Sat Dec 05 14:23:34 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/attendance:default Add environment and volu...
changeset 8ff1db4c0397 in modules/attendance:default details: https://hg.tryton.org/modules/attendance?cmd=changeset;node=8ff1db4c0397 description: Add environment and volumes to clone stage in drone issue9918 review308821002 diffstat: .drone.yml | 4 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r 3b7867bd2b69 -r 8ff1db4c0397 .drone.yml --- a/.drone.ymlMon Nov 02 17:12:24 2020 +0100 +++ b/.drone.ymlSat Dec 05 15:10:25 2020 + @@ -1,6 +1,10 @@ clone: hg: image: plugins/hg +environment: +- HG_SHARE_POOL=/root/.cache/hg +volumes: +- cache:/root/.cache pipeline: tox:
[tryton-commits] changeset in modules/sale:default Add country to module depends
changeset 3202c3272495 in modules/sale:default details: https://hg.tryton.org/modules/sale?cmd=changeset;node=3202c3272495 description: Add country to module depends issue9889 review333271002 diffstat: tryton.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 0e0d8add298f -r 3202c3272495 tryton.cfg --- a/tryton.cfgSat Dec 05 11:53:49 2020 +0100 +++ b/tryton.cfgWed Dec 09 09:58:14 2020 + @@ -6,6 +6,7 @@ account_invoice_stock account_product company +country currency ir party
[tryton-commits] changeset in trytond:default Use double backticks for literals i...
changeset 3680f0f283d2 in trytond:default details: https://hg.tryton.org/trytond?cmd=changeset;node=3680f0f283d2 description: Use double backticks for literals in documentation issue9827 review335091002 diffstat: doc/ref/bus.rst | 36 +- doc/ref/cache.rst | 24 +++--- doc/ref/exceptions.rst |2 +- doc/ref/filestore.rst |7 +- doc/ref/i18n.rst|8 +- doc/ref/models/fields.rst | 64 +- doc/ref/models/models.rst | 84 doc/ref/pool.rst|3 +- doc/ref/pyson.rst |6 +- doc/ref/rpc.rst |8 +- doc/ref/sendmail.rst| 13 ++- doc/ref/tests.rst | 26 --- doc/ref/transaction.rst | 10 +- doc/ref/wizard.rst | 30 doc/topics/access_rights.rst| 12 +- doc/topics/actions.rst | 10 +- doc/topics/backend_types.rst| 76 +++--- doc/topics/configuration.rst| 138 doc/topics/domain.rst |2 +- doc/topics/models/index.rst |2 +- doc/topics/modules/index.rst|5 +- doc/topics/reports/index.rst| 18 ++-- doc/topics/rpc.rst |4 +- doc/topics/setup_database.rst |8 +- doc/topics/start_server.rst | 27 --- doc/topics/task_queue.rst | 14 ++-- doc/topics/testing.rst | 24 +++--- doc/topics/triggers.rst |6 +- doc/topics/user_application.rst | 44 ++-- doc/topics/views/index.rst | 45 ++-- doc/topics/wizard.rst |2 +- 31 files changed, 384 insertions(+), 374 deletions(-) diffs (2114 lines): diff -r 9cce305c0eff -r 3680f0f283d2 doc/ref/bus.rst --- a/doc/ref/bus.rst Sun Nov 29 11:30:45 2020 + +++ b/doc/ref/bus.rst Sun Nov 29 11:35:29 2020 + @@ -7,8 +7,8 @@ .. class:: Bus -The Tryton server listens on `POST` requests on the routes matching -`//bus` and replies with JSON dictionary containing: +The Tryton server listens on ``POST`` requests on the routes matching +``//bus`` and replies with JSON dictionary containing: channel The channel on which this message has been received. @@ -18,20 +18,20 @@ of the message depends of its type. All messages should at least content a unique identifier in the key -`message_id` and their type in the key of the same name. +``message_id`` and their type in the key of the same name. Client sending their request on the route must be authenticated. The request must submit a JSON dictionary containing: last_message A value identifying the last message received by the client. This value -can be `null`. +can be ``null``. channels A list of strings denoting the channels the client is listening to. -The :class:Bus exposes two methods that are used by the framework: `publish` -and `subscribe`. +The :class:Bus exposes two methods that are used by the framework: ``publish`` +and ``subscribe``. .. classmethod:: Bus.publish(channel, message) @@ -43,9 +43,9 @@ .. classmethod:: Bus.subscribe(database, channels[, last_message]) -Subscribe a user client to some `channels` of messages. +Subscribe a user client to some ``channels`` of messages. -The `message_id` parameter defines the last message ID received by the +The ``message_id`` parameter defines the last message ID received by the client. It defaults to None when not provided. The default implementation provides an helper method to construct the response: @@ -54,9 +54,9 @@ Creates a dictionary suitable as a response from a message and a timestamp. -`channel` is the channel on which the message has been received. +``channel`` is the channel on which the message has been received. -`message` is the content of the message sent to the client. +``message`` is the content of the message sent to the client. Please note that the implementation relies on the fact that the order of the messages received is consistent accros different trytond instances allowing to @@ -65,22 +65,22 @@ Notification -Tryton provides a shortcut to send a notification with the `notify` method. +Tryton provides a shortcut to send a notification with the ``notify`` method. .. method:: notify(title[, body[, priority[, user[, client) Send a text message to a user's client to be displayed using a -notification popup. The meaning of `title`, `body` and `priority` is +notification popup. The meaning of ``title``, ``body`` and ``priority`` is defined in :ref:`bus_notification_spec`. -If `user` is not set, the current -:attr:`~trytond.transaction.Transaction.user` is used. Otherwise `user` is -the user ID to notify. +If ``user`` is not set, the current +
[tryton-commits] changeset in trytond:default Document One2One.get_relation method
changeset 9cce305c0eff in trytond:default details: https://hg.tryton.org/trytond?cmd=changeset;node=9cce305c0eff description: Document One2One.get_relation method issue9826 review331201002 diffstat: doc/ref/models/fields.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 2893c35d79df -r 9cce305c0eff doc/ref/models/fields.rst --- a/doc/ref/models/fields.rst Sun Nov 29 11:23:26 2020 + +++ b/doc/ref/models/fields.rst Sun Nov 29 11:30:45 2020 + @@ -866,9 +866,9 @@ Instance methods: -.. method:: Many2Many.get_target() +.. method:: One2One.get_relation() -Return the target :class:`~trytond.model.Model`. +Return the relation :class:`~trytond.model.Model`. .. method:: One2One.get_target()
[tryton-commits] changeset in modules/stock_forecast:default Test long_descriptio...
changeset 17aa6953608e in modules/stock_forecast:default
details:
https://hg.tryton.org/modules/stock_forecast?cmd=changeset;node=17aa6953608e
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 9b78445b20de -r 17aa6953608e .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_inventory_location:default Test long_...
changeset d8414c8672a2 in modules/stock_inventory_location:default
details:
https://hg.tryton.org/modules/stock_inventory_location?cmd=changeset;node=d8414c8672a2
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 1c2870a6780a -r d8414c8672a2 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_package:default Test long_description...
changeset 4ea0266cae4b in modules/stock_package:default
details:
https://hg.tryton.org/modules/stock_package?cmd=changeset;node=4ea0266cae4b
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 1fa883cc9219 -r 4ea0266cae4b .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_complaint:default Test long_descriptio...
changeset 6221bea8e1df in modules/sale_complaint:default
details:
https://hg.tryton.org/modules/sale_complaint?cmd=changeset;node=6221bea8e1df
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r ff43f9b1d929 -r 6221bea8e1df .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_credit_limit:default Test long_descrip...
changeset 9cfdf3668b2f in modules/sale_credit_limit:default
details:
https://hg.tryton.org/modules/sale_credit_limit?cmd=changeset;node=9cfdf3668b2f
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r d681552b04f2 -r 9cfdf3668b2f .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_discount:default Test long_description...
changeset 0de1a4b9abf1 in modules/sale_discount:default
details:
https://hg.tryton.org/modules/sale_discount?cmd=changeset;node=0de1a4b9abf1
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 0dddf0389343 -r 0de1a4b9abf1 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in trytond-gis:default Test long_description using twi...
changeset 65af9f176979 in trytond-gis:default
details: https://hg.tryton.org/trytond-gis?cmd=changeset;node=65af9f176979
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 8e5d3fc355e1 -r 65af9f176979 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in trytond:default Test long_description using twine c...
changeset 39fb64c66803 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=39fb64c66803
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 1ee01b952050 -r 39fb64c66803 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/party:default Add documentation files
changeset 483899893ccb in modules/party:default
details: https://hg.tryton.org/modules/party?cmd=changeset;node=483899893ccb
description:
Add documentation files
issue9139
review297241003
diffstat:
doc/conf.py| 60 +++
doc/design.rst | 217 +
doc/usage.rst | 120 +++
3 files changed, 397 insertions(+), 0 deletions(-)
diffs (409 lines):
diff -r 3d681249834b -r 483899893ccb doc/conf.py
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/doc/conf.py Tue Dec 15 12:40:23 2020 +
@@ -0,0 +1,60 @@
+# This file is part of Tryton. The COPYRIGHT file at the top level of
+# this repository contains the full copyright notices and license terms.
+
+modules_url = 'https://docs.tryton.org/projects/modules-{module}/en/{series}/'
+trytond_url = 'https://docs.tryton.org/projects/server/en/{series}/'
+
+
+def get_info():
+import configparser
+import os
+import subprocess
+import sys
+
+module_dir = os.path.dirname(os.path.dirname(__file__))
+
+config = configparser.ConfigParser()
+config.read_file(open(os.path.join(module_dir, 'tryton.cfg')))
+info = dict(config.items('tryton'))
+
+result = subprocess.run(
+[sys.executable, 'setup.py', '--name'],
+stdout=subprocess.PIPE, check=True, cwd=module_dir)
+info['name'] = result.stdout.decode('utf-8').strip()
+
+result = subprocess.run(
+[sys.executable, 'setup.py', '--version'],
+stdout=subprocess.PIPE, check=True, cwd=module_dir)
+version = result.stdout.decode('utf-8').strip()
+if 'dev' in version:
+info['series'] = 'latest'
+else:
+info['series'] = '.'.join(version.split('.', 2)[:2])
+
+for key in {'depends', 'extras_depend'}:
+info[key] = info.get(key, '').strip().splitlines()
+info['modules'] = set(info['depends'] + info['extras_depend'])
+info['modules'] -= {'ir', 'res'}
+
+return info
+
+
+info = get_info()
+
+project = info['name']
+release = version = info['series']
+default_role = 'ref'
+highlight_language = 'none'
+extensions = [
+'sphinx.ext.intersphinx',
+]
+intersphinx_mapping = {
+'trytond': (trytond_url.format(series=version), None),
+}
+intersphinx_mapping.update({
+m: (modules_url.format(
+module=m.replace('_', '-'), series=version), None)
+for m in info['modules']
+})
+
+del get_info, info, modules_url, trytond_url
diff -r 3d681249834b -r 483899893ccb doc/design.rst
--- /dev/null Thu Jan 01 00:00:00 1970 +
+++ b/doc/design.rstTue Dec 15 12:40:23 2020 +
@@ -0,0 +1,217 @@
+**
+Design
+**
+
+The *Party Module* introduces the following concepts:
+
+.. _model-party.party:
+
+Party
+=
+
+*Parties* are the primary concept provided by the *Party Module*.
+Each party represents a person, business, organisation, association or other
+group that can be treated as a single entity.
+
+There are often a lot of properties associated with a party, including things
+like `Addresses `,
+`Contact Mechanisms `, and sometimes one or more
+`Identifiers ` and `Categories `.
+
+.. seealso::
+
+ Parties can be found by opening the main menu item:
+
+ |Party --> Parties|__
+
+ .. |Party --> Parties| replace:: :menuselection:`Party --> Parties`
+ __ https://demo.tryton.org/model/party.party
+
+Reports
+---
+
+.. _report-party.label:
+
+Labels
+^^
+
+The *Labels* report creates a document containing the names and postal
+addresses of the selected parties.
+It is preformatted so it is ready to be printed onto labels which can then be
+stuck onto envelopes.
+
+Wizards
+---
+
+.. _wizard-party.check_vies:
+
+Check VIES
+^^
+
+The *Check* :abbr:`VIES (VAT Information Exchange System)` wizard uses the
+European Commission's `VIES web service`_ to verify that a party's
+VAT-identification number is valid.
+
+.. _VIES web service: https://ec.europa.eu/taxation_customs/vies/
+
+.. _wizard-party.replace:
+
+Replace
+^^^
+
+This wizard is used to replace selected duplicate parties with the party that
+should be used instead.
+It updates all the documents that the duplicate party appears on so they point
+to the party that is replacing it.
+The duplicate party is then deactivated and linked to the party that replaces
+it.
+
+.. _wizard-party.erase:
+
+Erase
+^
+
+This wizard clears out all of a party's personal data from the system
+including any historized data and any resources such as attachments or notes.
+
+.. note::
+
+ If the party `Replaced ` some other parties, then the
+ personal data for those other parties is also erased.
+
+.. _model-party.identifier:
+
+Identifier
+==
+
+A party identifier is a code that is used to identify a
+`Party `.
+They include things like company, personal identification, social security,
+tax and vat registration numbers.
+Most types of identifiers are
[tryton-commits] changeset in modules/sale_invoice_grouping:default Test long_des...
changeset 4c4f52a6e381 in modules/sale_invoice_grouping:default
details:
https://hg.tryton.org/modules/sale_invoice_grouping?cmd=changeset;node=4c4f52a6e381
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r aa358952915f -r 4c4f52a6e381 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_supply_day:default Test long_descript...
changeset a42361b632de in modules/stock_supply_day:default
details:
https://hg.tryton.org/modules/stock_supply_day?cmd=changeset;node=a42361b632de
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r ebf9272d8366 -r a42361b632de .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_supply_forecast:default Test long_des...
changeset b6ddca41675e in modules/stock_supply_forecast:default
details:
https://hg.tryton.org/modules/stock_supply_forecast?cmd=changeset;node=b6ddca41675e
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 4bbd7c6462ea -r b6ddca41675e .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_opportunity:default Test long_descript...
changeset f570d1e4e4eb in modules/sale_opportunity:default
details:
https://hg.tryton.org/modules/sale_opportunity?cmd=changeset;node=f570d1e4e4eb
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 735ba179ed82 -r f570d1e4e4eb .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_payment:default Test long_description ...
changeset 5a3a04385a4d in modules/sale_payment:default
details:
https://hg.tryton.org/modules/sale_payment?cmd=changeset;node=5a3a04385a4d
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 900776efd65b -r 5a3a04385a4d .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_price_list:default Test long_descripti...
changeset 28fe3710ca1d in modules/sale_price_list:default
details:
https://hg.tryton.org/modules/sale_price_list?cmd=changeset;node=28fe3710ca1d
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 30df92748732 -r 28fe3710ca1d .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_shipment_measurements:default Test lo...
changeset b847539e0ad6 in modules/stock_shipment_measurements:default
details:
https://hg.tryton.org/modules/stock_shipment_measurements?cmd=changeset;node=b847539e0ad6
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 3823f88b2358 -r b847539e0ad6 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_package_shipping:default Test long_de...
changeset b42b46c50ee7 in modules/stock_package_shipping:default
details:
https://hg.tryton.org/modules/stock_package_shipping?cmd=changeset;node=b42b46c50ee7
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 8e5b248384a3 -r b42b46c50ee7 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_package_shipping_dpd:default Test lon...
changeset 235f0ef2c1f6 in modules/stock_package_shipping_dpd:default
details:
https://hg.tryton.org/modules/stock_package_shipping_dpd?cmd=changeset;node=235f0ef2c1f6
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r f9cd4abde816 -r 235f0ef2c1f6 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -24,6 +24,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_lot_unit:default Test long_descriptio...
changeset 3e6166b42138 in modules/stock_lot_unit:default
details:
https://hg.tryton.org/modules/stock_lot_unit?cmd=changeset;node=3e6166b42138
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 405da1c8256b -r 3e6166b42138 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_split:default Test long_description u...
changeset ca6ed7732acf in modules/stock_split:default
details:
https://hg.tryton.org/modules/stock_split?cmd=changeset;node=ca6ed7732acf
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 6ca71f6b4d95 -r ca6ed7732acf .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_supply:default Test long_description ...
changeset ecf7c0c66a56 in modules/stock_supply:default
details:
https://hg.tryton.org/modules/stock_supply?cmd=changeset;node=ecf7c0c66a56
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 4b1ec9f1974a -r ecf7c0c66a56 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_supply_production:default Test long_d...
changeset eaeb8d83a6fc in modules/stock_supply_production:default
details:
https://hg.tryton.org/modules/stock_supply_production?cmd=changeset;node=eaeb8d83a6fc
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 6a2534929d41 -r eaeb8d83a6fc .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_product_location:default Test long_de...
changeset 5fb5030a9308 in modules/stock_product_location:default
details:
https://hg.tryton.org/modules/stock_product_location?cmd=changeset;node=5fb5030a9308
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r cf9eb2ab5337 -r 5fb5030a9308 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_secondary_unit:default Test long_desc...
changeset b4b1e20e5a14 in modules/stock_secondary_unit:default
details:
https://hg.tryton.org/modules/stock_secondary_unit?cmd=changeset;node=b4b1e20e5a14
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r ccc8144ae47c -r b4b1e20e5a14 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/party:default Improve documentation
changeset 3d681249834b in modules/party:default
details: https://hg.tryton.org/modules/party?cmd=changeset;node=3d681249834b
description:
Improve documentation
issue9139
review297241003
diffstat:
doc/index.rst | 76 ++
setup.py | 7 +++-
2 files changed, 14 insertions(+), 69 deletions(-)
diffs (111 lines):
diff -r b49853ed1821 -r 3d681249834b doc/index.rst
--- a/doc/index.rst Tue Dec 15 11:42:56 2020 +
+++ b/doc/index.rst Tue Dec 15 12:37:15 2020 +
@@ -1,72 +1,14 @@
+
Party Module
-The party module defines the concepts of party, identifier, category and
-contact mechanism. It also comes with reports to print labels and letters and a
-*Check VIES* wizard.
-
-
-Party
-*
-
-A party can be a person, a company or any organisation that one want
-to consider as the same entity. A party is defined by a name, a code,
-a language, identifiers, categories, contact mechanisms and a list of
-addresses.
-
-Two reports are available:
-
-- The *Labels* report creates a document with the names and addresses
- of all selected parties which are preformatted to be printed on
- labels that can be stuck on an envelope.
-- The *Letter* report create a document pre-filled with the company
- header, the address of the recipient, a date, a greeting, an ending
- and the signature of the current reader.
-
-The *Check VIES* wizard allows to check the European VAT number identifier of
-parties with the VIES web service.
-
-The *Replace* wizard allows to replace duplicate record by the original and
-relink all the related documents.
-
-The *Erase* wizard allows to erase all personal data of a party from the system
-included the historized data and the resources attached for all the parties
-which were replaced by this one.
-
-Address
-***
+The *Party Module* is used to store and manage information about people,
+businesses, organisations, and associations.
+It allows you to save information such as contact details, addresses,
+identifiers and the language used by each of these different entities.
-An address is made of a name, a street, a zip number, a city, a
-country, a subdivision. A sequence allow to order them.
-The field *Full Address* returns the formatted address included the name of the
-party if the context has `address_with_party` set to True, the attention name
-if the context has `address_attention_party` set to a party and without the
-country if the context key `address_from_country` is the same as the country of
-the address.
-
-
-Address Format
-**
-
-It allows to define per country and language, how addresses should be
-formatted.
+.. toctree::
+ :maxdepth: 2
-Address Subdivision Type
-
-
-It allows to define for each country which types of subdivision are allowed on
-the address.
-
-Contact Mechanism
-*
-
-A contact mechanism is made of a type, value and comment. Type can be
-*Phone*, *Mobile*, *Fax*, *E-Mail*, *Website*, *Skype*, *SIP*, *IRC*,
-*Jabber* or *Other*.
-
-
-Category
-
-
-A Category is just composed of a name, thus constituting tags that can
-be associated to parties. Categories are organised in a tree structure.
+ usage
+ design
diff -r b49853ed1821 -r 3d681249834b setup.py
--- a/setup.py Tue Dec 15 11:42:56 2020 +
+++ b/setup.py Tue Dec 15 12:37:15 2020 +
@@ -10,9 +10,12 @@
def read(fname):
-return io.open(
+content = io.open(
os.path.join(os.path.dirname(__file__), fname),
'r', encoding='utf-8').read()
+content = re.sub(
+r'(?m)^\.\. toctree::\r?\n((^$|^\s.*$)\r?\n)*', '', content)
+return content
def get_require_version(name):
@@ -80,7 +83,7 @@
download_url=download_url,
project_urls={
"Bug Tracker": 'https://bugs.tryton.org/',
-"Documentation": 'https://docs.tryton.org/',
+"Documentation": 'https://docs.tryton.org/projects/modules-party/',
"Forum": 'https://www.tryton.org/forum',
"Source Code": 'https://hg.tryton.org/modules/party',
},
[tryton-commits] changeset in modules/stock_location_sequence:default Test long_d...
changeset 9cf6624d8826 in modules/stock_location_sequence:default
details:
https://hg.tryton.org/modules/stock_location_sequence?cmd=changeset;node=9cf6624d8826
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 034b12982794 -r 9cf6624d8826 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_lot:default Test long_description usi...
changeset a856c8898ad1 in modules/stock_lot:default
details: https://hg.tryton.org/modules/stock_lot?cmd=changeset;node=a856c8898ad1
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r ddb04eb1a753 -r a856c8898ad1 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_lot_sled:default Test long_descriptio...
changeset e933d85dfdf7 in modules/stock_lot_sled:default
details:
https://hg.tryton.org/modules/stock_lot_sled?cmd=changeset;node=e933d85dfdf7
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 3152e29422a8 -r e933d85dfdf7 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_stock_quantity:default Test long_descr...
changeset d4a6819f71bc in modules/sale_stock_quantity:default
details:
https://hg.tryton.org/modules/sale_stock_quantity?cmd=changeset;node=d4a6819f71bc
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 76ecbcc9590d -r d4a6819f71bc .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_subscription:default Test long_descrip...
changeset eb4fe6323a94 in modules/sale_subscription:default
details:
https://hg.tryton.org/modules/sale_subscription?cmd=changeset;node=eb4fe6323a94
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r d1b951e262f6 -r eb4fe6323a94 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:56 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_package_shipping_ups:default Test lon...
changeset fb59c7a0cb38 in modules/stock_package_shipping_ups:default
details:
https://hg.tryton.org/modules/stock_package_shipping_ups?cmd=changeset;node=fb59c7a0cb38
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 6e6d5c8993bf -r fb59c7a0cb38 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -24,6 +24,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/web_shortener:default Test long_description...
changeset c978b509569c in modules/web_shortener:default
details:
https://hg.tryton.org/modules/web_shortener?cmd=changeset;node=c978b509569c
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 1a3a6e51a90a -r c978b509569c .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/web_user:default Test long_description usin...
changeset 36a52a97f8f8 in modules/web_user:default
details: https://hg.tryton.org/modules/web_user?cmd=changeset;node=36a52a97f8f8
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r bf23254cc65b -r 36a52a97f8f8 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/timesheet:default Test long_description usi...
changeset f7501b3e3b4c in modules/timesheet:default
details: https://hg.tryton.org/modules/timesheet?cmd=changeset;node=f7501b3e3b4c
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 9178a2294696 -r f7501b3e3b4c .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/user_role:default Test long_description usi...
changeset 965a2453166d in modules/user_role:default
details: https://hg.tryton.org/modules/user_role?cmd=changeset;node=965a2453166d
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r b67571198c34 -r 965a2453166d .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/web_shop:default Test long_description usin...
changeset f82fa309d9b8 in modules/web_shop:default
details: https://hg.tryton.org/modules/web_shop?cmd=changeset;node=f82fa309d9b8
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 4a0990f040d4 -r f82fa309d9b8 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/timesheet_cost:default Test long_descriptio...
changeset 8baa4ebdb9e6 in modules/timesheet_cost:default
details:
https://hg.tryton.org/modules/timesheet_cost?cmd=changeset;node=8baa4ebdb9e6
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r a58549c83b16 -r 8baa4ebdb9e6 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/web_shop_vue_storefront:default Test long_d...
changeset 0fd7cdb0af30 in modules/web_shop_vue_storefront:default
details:
https://hg.tryton.org/modules/web_shop_vue_storefront?cmd=changeset;node=0fd7cdb0af30
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r e404b513a2bd -r 0fd7cdb0af30 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/web_shop_vue_storefront_stripe:default Test...
changeset fb76f569ca37 in modules/web_shop_vue_storefront_stripe:default
details:
https://hg.tryton.org/modules/web_shop_vue_storefront_stripe?cmd=changeset;node=fb76f569ca37
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r d7ea1f28ee66 -r fb76f569ca37 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in proteus:default Test long_description using twine c...
changeset a6d7090c3f3f in proteus:default
details: https://hg.tryton.org/proteus?cmd=changeset;node=a6d7090c3f3f
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 26611e92a723 -r a6d7090c3f3f .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -21,6 +21,12 @@
- tox -e "${TOXENV}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
matrix:
include:
[tryton-commits] changeset in tryton:default Test long_description using twine check
changeset 2dab1b037df3 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset;node=2dab1b037df3
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 4626fb6fe8f0 -r 2dab1b037df3 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:54 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -17,6 +17,12 @@
- tox -e "${TOXENV}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
matrix:
include:
[tryton-commits] changeset in modules/stock_location_move:default Test long_descr...
changeset 46aaadda28e1 in modules/stock_location_move:default
details:
https://hg.tryton.org/modules/stock_location_move?cmd=changeset;node=46aaadda28e1
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 5330e89038f4 -r 46aaadda28e1 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in trytond:5.8 Document One2One.get_relation method
changeset 3c9beb2092d3 in trytond:5.8 details: https://hg.tryton.org/trytond?cmd=changeset;node=3c9beb2092d3 description: Document One2One.get_relation method issue9826 review331201002 (grafted from 9cce305c0eff2841ffdfbe78f16e2b1c0913b0aa) diffstat: doc/ref/models/fields.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 2570a110d115 -r 3c9beb2092d3 doc/ref/models/fields.rst --- a/doc/ref/models/fields.rst Fri Dec 11 15:44:04 2020 +0100 +++ b/doc/ref/models/fields.rst Sun Nov 29 11:30:45 2020 + @@ -866,9 +866,9 @@ Instance methods: -.. method:: Many2Many.get_target() +.. method:: One2One.get_relation() -Return the target :class:`~trytond.model.Model`. +Return the relation :class:`~trytond.model.Model`. .. method:: One2One.get_target()
[tryton-commits] changeset in trytond:5.6 Document One2One.get_relation method
changeset 5a81202f8af7 in trytond:5.6 details: https://hg.tryton.org/trytond?cmd=changeset;node=5a81202f8af7 description: Document One2One.get_relation method issue9826 review331201002 (grafted from 9cce305c0eff2841ffdfbe78f16e2b1c0913b0aa) diffstat: doc/ref/models/fields.rst | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 4ecc798e0876 -r 5a81202f8af7 doc/ref/models/fields.rst --- a/doc/ref/models/fields.rst Fri Dec 11 15:44:43 2020 +0100 +++ b/doc/ref/models/fields.rst Sun Nov 29 11:30:45 2020 + @@ -866,9 +866,9 @@ Instance methods: -.. method:: Many2Many.get_target() +.. method:: One2One.get_relation() -Return the target :class:`~trytond.model.Model`. +Return the relation :class:`~trytond.model.Model`. .. method:: One2One.get_target()
[tryton-commits] changeset in modules/stock_consignment:default Test long_descrip...
changeset 1c543489460c in modules/stock_consignment:default
details:
https://hg.tryton.org/modules/stock_consignment?cmd=changeset;node=1c543489460c
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 259a347eded5 -r 1c543489460c .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_supply_production:default Test long_de...
changeset cae49ec0bc75 in modules/sale_supply_production:default
details:
https://hg.tryton.org/modules/sale_supply_production?cmd=changeset;node=cae49ec0bc75
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 7f9fb4a337ac -r cae49ec0bc75 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock:default Test long_description using t...
changeset 22d02a70615b in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=22d02a70615b
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 72340cdb550c -r 22d02a70615b .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/stock_assign_manual:default Test long_descr...
changeset 5a9ab008ce4a in modules/stock_assign_manual:default
details:
https://hg.tryton.org/modules/stock_assign_manual?cmd=changeset;node=5a9ab008ce4a
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 778ee4655143 -r 5a9ab008ce4a .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
[tryton-commits] changeset in modules/sale_supply:default Test long_description u...
changeset c51de4d56a62 in modules/sale_supply:default
details:
https://hg.tryton.org/modules/sale_supply?cmd=changeset;node=c51de4d56a62
description:
Test long_description using twine check
issue9781
review337181002
diffstat:
.drone.yml | 6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diffs (16 lines):
diff -r 25c605a5d4ed -r c51de4d56a62 .drone.yml
--- a/.drone.ymlFri Dec 11 13:51:53 2020 +0100
+++ b/.drone.ymlTue Dec 15 11:42:57 2020 +
@@ -23,6 +23,12 @@
- tox -e "${TOXENV}-${DATABASE}"
volumes:
- cache:/root/.cache
+check_dist:
+image: ${IMAGE}
+commands:
+- pip install twine
+- python setup.py sdist
+- twine check dist/*
services:
postgresql:
