Commit Graph
72 Commits
Author SHA1 Message Date
Tiffany Chang (tic) a60527bde7 [IMP] delivery, mrp, stock: group delivery slips by kit
This commit extends the delivery slip so that products added as a kit
component to a stock.picking are grouped together by kit (or non-kit)
when at least 1 kit exists. Kit grouping occurs for products from a kit
without a package assigned. Non-kit section appears only when no
packages are assigned.

Implementation notes:
- Sub-kits (i.e. kits within kits) of kits are purposely not included
- Duplicate product names with different BOMs will be merged into one
  since there is no straightforward way to distinguish them within
  current db structure
- There are some cases where this doesn't work as expected and may lead
  to components being grouped together under the same kit even if they
  are from different kits (e.g. kit1 has bolts and so does kit2 => on
  slip bolts will only show under kit1 section). Two cases where this
  happens is when kits are added before 'Operation Type' is specified
  and 'Operation Type = Manufacturing'

This completes subsection 1 of overall Improve delivery slip task.

Task: 2039720
2020-07-03 11:54:08 +00:00
Tiffany Chang (tic) d20467bb6a [IMP] delivery, stock: group delivery slip packages
This commit makes it so if a delivery slip contains 1 or more packages
then move lines will be split by package (and non-package) groups with a
"section line" between them. This only applies to when a stock.picking
is 'State=Done'.

In order to accomodate complexity of splitting by package + grouping by
product unless printing serial numbers/lots + template inheritance,
reoccurring parts of the template are split into their own templates and
called. Relevant inheritance has been updated to match.

Additionally, picking.shipping_weight calculation has been updated so if
a pack.weight = 0 then calculation will default to the calculated
product weight. This prevents inconsistency between the "Total Weight"
at the top of the Delivery Slip and the package sections' displayed
weights. To distinguish which value is being used, package sections that
use the total product weight rather than the pack.weight have
"(estimated)" after it.

This completes subsection 3 of overall Improve delivery slip task.

Task: 2039720
2020-07-03 11:54:08 +00:00
Tiffany Chang (tic) 0accbd6e69 [IMP] stock, delivery: aggregate delivery slip product lines
This commit makes it so move_lines with the same product+description+uom
are grouped together ONLY WHEN serial numbers/lots are not to be
printed. This is the case when the setting "Display Lots & Serial
Numbers on Delivery Slips" is not active or when there are no
lots/serial numbers assigned in the picking. This is only applicable for
stock.pickings that are 'state=Done'.

In order to implement this, some clean up of lots/serial numbers printing
was also done.

This completes subsection 2 of overall Improve Delivery Slip task.
Task: 2008609
2020-07-03 11:54:08 +00:00
jvm-odoo 221ee7d5b2 [FIX] stock: fix delivery slip date tz issue
This commit fixes an issue with deliveries slip
when time < 10 AM in autraslian timezone.

If datetime is 22/06/2020 5AM,
it will be 21/06/2020 on the delivery slip.

This is due to the fact that we use
widget=date on a datetime field.

OPW-2277194

closes odoo/odoo#53425

X-original-commit: c8ec8b4ffbaceb9a58a5ca48bd5a087e779edcc9
Signed-off-by: Jason Van Malder (jvm) <jvm@odoo.com>
2020-06-22 13:32:05 +00:00
Tiffany Chang (tic) f372a58e59 [IMP] stock: include backorder products on delivery slip
Delivery slip updated to include the backordered products (not
canceled or already done) in a new table. Note that this only goes
1 level deep (i.e. backorders with backorders will not have their
backordered values included).

To support table alignment, small changes were made to existing delivery
slip table.

This covers specification 4 of inventory usability task.
Task: 2206279
Related Enterprise PR: odoo/enterprise#10723
2020-06-22 11:55:26 +00:00
Goffin Simon 3c2a2f7aa3 [FIX] stock: Internal note displayed in Delivery slip
Steps to reproduce the bug:

- Let's consider a consumable product P with an internal note IN in Dutch
- Create a SO with dutch partner P and confirm it
- Process the delivery and validate it
- Print the delivery slip

Bug:

The internal note IN was displayed on the delivery slip.
The internal note must never appear on a delivery slip.

opw:2227613

closes odoo/odoo#50689

X-original-commit: 4b8d9806c6ee0a85812041f25080617daa7b10f1
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
2020-05-05 15:35:26 +00:00
Goffin Simon 435e47385d [FIX] stock: Internal note displayed in Delivery slip
Steps to reproduce the bug:

- Let's consider a consumable product P with an internal note IN
- Create a SO with P and confirm it
- Process the delivery and validate it
- Print the delivery slip

Bug:

The internal note NI was displayed on the delivery slip.

Fine tuning of https://github.com/odoo/odoo/commit/038221f3180a7a8888503553dbb5eb57875ef3a6

opw:2227613

closes odoo/odoo#49860

X-original-commit: 9b6ea1cdbed02c0f2ccd3e2608e4caf12c8c24ac
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
2020-04-21 11:56:38 +00:00
Goffin Simon 17b5476d54 [FIX] stock: Internal note displayed in Delivery slip
Steps to reproduce the bug:

- Let's consider a consumable product P with an internal note IN
- Create a SO with P and confirm it
- Print the delivery slip

Bug:

The internal note NI was displayed on the delivery slip.

opw:2227613

closes odoo/odoo#49277

X-original-commit: 038221f3180a7a8888503553dbb5eb57875ef3a6
Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
2020-04-09 08:05:01 +00:00
svs-odoo a5ef8f2b8a [FIX] stock: description delivery slip
Before this commit, the description of the move was displayed on the
Delivery Slip report, even if the description is exaclty the same as the
product name (which is the case by default).
Now, as it's somehow ugly to have the repetition, they will not display
the description if it's the same as the product name.

opw-2205325

closes odoo/odoo#46550

X-original-commit: e6ee4824a6e422960c648e9a1f684e56e6dabd89
Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
2020-02-28 12:18:56 +00:00
William Henrotin 1d872f24b1 [FIX] stock: use picking decription in delivery slip
The delivery slip report on stock picking always read the product
description not the one the picker set on stock moves.

This commit takes the stock move description for the report when displaying
stock moves and stock move lines

Task : 2180347

closes odoo/odoo#44182

Signed-off-by: Arnold Moyaux <amoyaux@users.noreply.github.com>
2020-01-30 13:05:15 +00:00
david 9fe8dc50cd [IMP] stock: add names to columns and divs for better inheritance
Closes odoo/odoo#37814

X-original-commit: 38195eb961cc792d116cc6eaf2b149883ca91e37
2020-01-22 12:21:35 +00:00
svs-odooandsle-odoo 596b246f93 [IMP] stock: add signature field on picking
On a delivery type picking, adds a button to able the partner to sign
the delivery on receipt.

task-1878607

closes odoo/odoo#39183

Signed-off-by: Simon Lejeune (sle) <sle@openerp.com>
Co-authored-by: sle-odoo <sle@odoo.com>
2019-10-28 10:46:06 +00:00
Dharmraj Jhala 30b1af7937 [IMP] * : enable static string edition using report editor
*:
	delivery
	hr_timesheet
	mrp
	sale
	sale_coupon
	stock

This commit makes the static strings / labels editable with studio
by wrapping them in appropriate tag (mostly span) whenever needed.

Task-Id 2030430

closes odoo/odoo#34685

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
2019-10-17 09:39:01 +00:00
Prakash Prajapati eccabdab42 [IMP] stock, delivery: usability changes in the delivery slip report.
Add the total weight of the picking on the delivery slip (next to the date field) (only if different than 0)

Add a column "HS code" on the product line if there is at least one product with an HS code

task-1889404

Closes #29209
2019-07-31 08:04:38 +00:00
Goffin Simon 0e44904267 [FIX] stock: Delivery slip with serial number
Steps to reproduce the bug:
- Select template type boxed in general settings
- Select show serial/lot number in Delivery slip (in inventory - settings)
- Print the delivery slip with a non tacked product

Bug:

The delivery slip report displayed wrong columns.

opw:2031985

closes odoo/odoo#34852

Signed-off-by: Simon Goffin (sig) <sig@openerp.com>
2019-07-15 08:43:59 +00:00
Christophe Simonis 9a4e84ae66 [MERGE] forward port branch saas-11.3 up to f5ab04ce50 2019-03-14 14:13:47 +01:00
Christophe Simonis afe8e97800 [MERGE] forward port branch 11.0 up to c23d1186e7 2019-03-13 16:52:40 +01:00
Christophe Simonis f1ff55bca1 [MERGE] forward port branch 11.0 up to de8cefcef4 2019-02-20 13:40:48 +01:00
Nicolas Martinelli 09bf391f4d [FIX] stock: delivery slip address
After discussion with the Mighty Priestess, the address used in the
Delivery Slip should be the picking partner as a first priority, then
the move lines partner.

And we therefore remove the useless 'Assign Partner' button (but not the
associated method since it is public).

opw-1935039

closes odoo/odoo#31250
2019-02-19 14:48:20 +00:00
Enric Tobella c16d2827bc [FIX] context on reports
closes odoo/odoo#31150

Signed-off-by: Quentin De Paoli (qdp) <qdp@openerp.com>
2019-02-15 12:58:38 +00:00
Christophe Simonis f6540c26ff [FIX] stock: correctly correct report view 2019-02-20 18:59:46 +01:00
Christophe Simonis d98bf74579 [FIX] stock: correct report view
Oversight of previous forward-port
2019-02-20 18:31:04 +01:00
Christophe Simonis db1c7765cb [MERGE] forward port branch saas-11.3 up to 2c495502aa 2019-02-20 17:37:22 +01:00
Goffin Simon 274f956f8d [FIX] stock: Lot/Serial Number not displayed
The field lot_name is not initialised in many cases.

Steps to reproduce the bug:

- Set your user in the group called "Display Serial & Lot Number in Delivery Slips"
- Create a new stockable product P with setting tracking "by unique serial number"
- Create 10 serial numbers for P
- Purchase 10 units of P and select the 10 serial numbers created
- Create a SO where I selected 1 unit of P with its serial number and confirm it
- Go to the delivery slip and print the delivery slip

Bug:

The serial number was not printed in the delivery slip.

opw:1900735

closes odoo/odoo#28076
2018-10-24 08:11:32 +00:00
Christophe Simonis 68d36512ef [MERGE] forward port branch saas-11.4 up to d78f23df84 2018-09-07 20:20:45 +02:00
Christophe Simonis f19e6ce561 [MERGE] forward port branch 11.0 up to 213759b03e 2018-09-05 18:52:27 +02:00
Goffin Simon 6bc2be09f5 [FIX] stock: Description for receptions are not being shown in Delivery Slip
Steps to reproduce

- Create a product with a custom description for receptions

- Create a purchase order

- Open the resulting picking

Shown behavior

- Product name is shown, description for receptions isn't shown in the delivery slip report

PS: Same scenario with a sale order

opw:1879069
2018-08-29 10:07:53 +02:00
Christophe Simonis 4f62d6dd8f [MERGE] forward port branch saas-11.4 up to ef6b574eda 2018-08-22 12:02:30 +02:00
Christophe Simonis 70d0148d0d [MERGE] forward port branch 11.0 up to fbfb91799e 2018-08-21 16:58:17 +02:00
Alexandre Moens 429f785426 [REV] Revert "[FIX] Stock : deliveryslip report - prioritize partner_id (#25709)" (#26458)
This reverts commit 6e8f1fcc63.

Reverted commit broke more than it fixed.

What it fixed : Show partner info when partner is changed after the
movelines are created (very specific used case, could be considered to
be the wrong way to do things)

What it broke : dropshipping
2018-08-20 15:29:29 +02:00
Simon Lejeune f57bc96d32 [REF] stock: add a group to display/hide the lot name on the delivery
initial work by Alexandre Moens <mao@odoo.com>
task 1832574
closes #24299
2018-08-16 15:01:25 +02:00
qsm-odoo 6e223b9273 [REF] *: BS4, adapt tables (and list view)
`table-condensed` -> `table-sm`

Also SCSS variables were renamed.
Also restore list view design.
2018-07-27 12:36:54 +02:00
Cédric Snauwaert c71da7db84 [REF] report, *: defines address area in external layout templates
This is needed because some reports we want to add later on, need to have
    the address field on the left or following a given format.

    Hence we moved the address div from each existing report on to the main report
    template itself, Since some reports uses up until 3 addresses, we have defined
    an area for the main address that each report can set (address used on the
    envelope's window for sending). The any other extra address, or additional
    information should be defined in the 'information_block' div

Was part of task: 35289
Was part of PR #25472
2018-07-24 17:12:52 +02:00
Christophe Simonis f3929aa0f7 [MERGE] forward port branch saas-11.2 up to 87dadc5bc8 2018-07-13 14:32:05 +02:00
Christophe Simonis 52e28c903c [MERGE] forward port branch saas-15 up to 650bc6419c 2018-07-12 16:06:19 +02:00
Christophe Simonis 1926b40212 [MERGE] forward port branch 10.0 up to 718a5b76b8 2018-07-12 11:29:22 +02:00
Alexandre Moens 6e8f1fcc63 [FIX] Stock : deliveryslip report - prioritize partner_id (#25709)
Display the address  of the partner_id when available rather than using the partner id  of the movelines. Important when the partner  is changed after the movelines are created.

support ticket :  1857582
2018-07-11 14:43:33 +02:00
Goffin Simon 41bea4125c [FIX] stock: Delivery slip with quantity = 0 until validation
Partial backport of https://github.com/odoo/odoo/commit/ccafe50500a803fe8c8345ab0318128a92bce3b5

Now the initial demand is used when the state is not done.

opw:1867906
2018-07-24 13:00:06 +02:00
Lucas Perais (lpe) d1df278f01 [FIX] stock: portal user can see pack operations
Have a delivery for a client, with pack operations
Connect on this user's portal

Go on the SO and then on the delivery

Before this commit, there was an Error 500
because access to fields of pack_operations was forbidden

After this commit, the report downloads well

OPW 1849520
closes #24849
2018-05-23 09:18:21 +02:00
Prakash Prajapati ccafe50500 [IMP] product_expiry, stock, delivery: Delivery slip report improvement
- Delivery slip of a picking not done will show the initial demands
- Delivery slip of a picking done will show details of what have been processed
- Remove the shipment backorder message
- Remove the Weight and show the Shipping Weight

TASK-38741
2018-04-09 11:23:59 +02:00
Christophe Simonis 78dced6bc2 [MERGE] forward port branch 10.0 up to c2b3ad1899 2018-03-21 15:55:26 +01:00
Nicolas Martinelli 65bad81b2c [FIX] stock: Delivery Slip
- Create a picking to deliver 10 units, save
- Edit and change to 12 units
- Print the Delivery Slip => the qty is 10
- Validate the picking with 12 units
- Print the Delivery Slip => the qty is still 10

The use of `ordered_qty` is misleading, since it corresponds to the qty
ordered at creation.

Backport of 0a2999cdd9

opw-1825396
2018-03-21 11:00:36 +01:00
Simon Lejeune 0a2999cdd9 [FIX] stock: delivery slip report
The delivery slip is a document targeted to the customer, it is
important that the quantities displayed there reflects what's actually
been delivered.

As for some reason the delivery slip tries do display some stuff on a
not yet done picking and as the ordered_qty field on the move line do
not reflect the ordered quantity but instead the first quantity reserved
on it, we apply the following changes to make the report consistent.

- In all cases, only display the quantity done.
- Get rid of the ordered / delivered quantities. If the move wasn't
  processed fully and a backorder will follow, a message is shown at
  the end of the picking.

There's an ongoing task to fix this report in a better way on master.

opw-1808126
2018-03-16 10:42:22 +01:00
Goffin Simon c2e878e34c [FIX] stock: Delivery Order Issues
When printing the delivery slip of a stock.pick, the message:

"All items couldn't be shipped, the remaining ones will be shipped as soon as they become available."

must be displayed only if there is still a backorder to process for this picking.

opw:1817573
2018-03-01 18:45:55 +01:00
Pierre Masereel b62973e901 [REF] stock: packages and report
- delivery slip: remove mention of packages
- package: fix the report's traceback
- picking: moved the packages references to a table at the bottom of the report
2017-12-12 13:34:06 +01:00
Goffin Simon 5082dc55d5 [FIX] stock: 500 error when clicking on WH/OUT on portal
When clicking on WH/OUT  in a SO as portal user in My Account on the website,
it raised an 500 error if the product in the SO is not published on the website.

opw:777708
2017-10-26 14:13:16 +02:00
Kinjal Mehta f6144fe1f3 [REF] stock: update picking operation and delivery slip report.
Updated report for stock refactoring.
2017-10-02 09:32:35 +02:00
Christophe Simonis 99426b95b5 [MERGE] forward port branch 10.0 up to c5df78f38b 2017-09-04 16:15:28 +02:00
Nicolas Martinelli 65f5fc6bf8 [FIX] stock: delivery slip
Complement of commit b0d498c11d

The delivered quantity displayed on the "Delivery Slip" should use the
same UOM than the "Ordered Quantity".

opw-766914
2017-08-30 16:12:15 +02:00
Christophe Simonis e18fe88751 [MERGE] forward port branch 10.0 up to 22eb3ee971 2017-08-28 12:13:05 +02:00