Commit Graph

4130 Commits

Author SHA1 Message Date
Deepesh Garg
c41fb7556b fix: Add test case for batch pricing 2020-12-09 15:55:39 +05:30
Deepesh Garg
bc0a2859e4 fix: Rate for items with no batch 2020-12-09 12:40:09 +05:30
Deepesh Garg
91e1136d2c feat: Batch wise item pricing 2020-12-08 22:53:03 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request from marination/pr-dn-return
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message
grammatical fix
2020-12-06 10:48:32 +05:30
Rohit Waghchaure
8474476316 fix: incorrect balance value in stock balance report 2020-12-03 13:43:11 +05:30
jbienesdev
8e68f128c1 fix: travis build error
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
2020-12-02 08:56:49 +00:00
jbienesdev
b4b542d1c3 chore: linter issues and sider checks 2020-12-02 07:15:16 +00:00
jbienesdev
99361b4a9e chore: remove notification details section 2020-12-02 07:15:14 +00:00
jbienesdev
28055f483d fix(shipment): change shipment test and refactor shipment.js 2020-12-02 07:15:13 +00:00
jbienesdev
ac3c1f1493 chore: remove packlink, letmeship, and sendcloud files 2020-12-02 07:15:11 +00:00
jbienesdev
000494f548 fix(shipment): apply code review 2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8 feat(shipment): Shipment Doctype with Integrations 2020-12-02 07:14:58 +00:00
marination
724e16bca1 chore: Use JSON style response and use ORM
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
2020-11-30 12:55:30 +05:30
Deepesh Garg
1a4390de44 Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters 2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e fix: Move filter setup to doctype controllers 2020-11-25 14:49:10 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return 2020-11-25 10:43:55 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card ()
* feat: Quality Inspection on Job Card

* fix(Job Card): quality inspection filter query

* fix: sider issues
2020-11-25 09:17:16 +05:30
Anurag Mishra
927106f552 fix: maintain stock can't be changed it there is product bundle 2020-11-24 15:02:52 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request from pateljannat/track-changes-in-stock-settings
fix: enabling track changes for stock settings
2020-11-23 15:57:48 +05:30
pateljannat
34f381df17 fix: enabling track changes for stock settings 2020-11-23 15:31:08 +05:30
Jannat Patel
34d07b6306
fix: purchase receipt to purchase invoice bill date mapping ()
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-11-20 19:22:35 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return 2020-11-19 12:21:38 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field ()
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf
feat: Formula based Quality Inspection ()
* feat: Formula based Quality Inspection

* chore: Added Test for Formula Based QI reading
2020-11-19 08:12:58 +05:30
rohitwaghchaure
67ba0462e9
Merge pull request from kevingdc/fix/item-price-duplicate-checking
fix: Item price duplicate checking
2020-11-18 16:41:48 +05:30
rohitwaghchaure
7aa60d1dea
fix: stock ageing report not working () 2020-11-17 12:10:27 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry ()
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30
Jannat Patel
0ea0a7495c
fix: making company address read-only in delivery note () 2020-11-12 11:10:59 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching 2020-11-11 11:10:34 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching 2020-11-09 12:59:10 +05:30
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms 2020-11-06 12:28:55 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return 2020-11-06 12:25:11 +05:30
Marica
6d2bcd2404
Merge branch 'develop' into purchase-invoice-payment-terms 2020-11-05 12:25:38 +05:30
Marica
fd2b7d3c1d
Merge branch 'develop' into dialog-cleanup 2020-11-05 12:22:50 +05:30
rohitwaghchaure
64059db69f
Merge pull request from Anurag810/stock_ledger_report
fix:  list index out of range on including UOM
2020-11-05 11:49:46 +05:30
Afshan
cdc17bb9f3 fix: added code for testing 2020-11-04 19:28:55 +05:30
Anurag Mishra
09b8ca0ddb fix: list index out of range on incilding uom 2020-11-04 15:04:50 +05:30
marination
7837161a3f fix: Sider 2020-11-03 22:09:42 +05:30
Marica
7b42e8e27c
Merge branch 'develop' into dialog-cleanup 2020-11-03 16:26:06 +05:30
marination
f21e3fbf04 chore: Tests
- Added test for mapping secnd return doc
- Added test for billing % of partially returned doc
- Handled PR with 0 billing amount
2020-11-03 12:01:56 +05:30
Kevin Chan
a2ba8ea74a style: Clean up code formatting 2020-11-03 10:57:52 +08:00
Kevin Chan
312561fd77 Merge branch 'develop' into fix/item-price-duplicate-checking 2020-11-03 10:56:23 +08:00
marination
3991b84b2b chore: Avoid multiline string in Translation & remove print statement 2020-11-02 15:23:41 +05:30
marination
28dd90f3dc Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return 2020-11-02 15:16:31 +05:30
marination
d6596a169c fix: Billing % Logic and Map Pending Qty only in PR and DN
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
2020-11-02 15:07:48 +05:30
marination
542ae6ab97 chore: Linter and Sider fixes
- Translatable  strings cannot be multi line or be formatted by '+'
- Reduce no of tabs in stock_entry.js
2020-11-02 08:50:48 +05:30
marination
66b2b544f8 chore: Purchase Receipt, added required by date in PO popup 2020-10-30 17:45:28 +05:30
marination
e14fdf4a3c chore: RFQ cleanup and Title case for 'Get Items From'
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
Rohit Waghchaure
71913c36a7 fix: po_detail field has no value for subcontracted stock entry 2020-10-30 14:35:16 +05:30
marination
6bf507a54b chore: (MR)Added delivery date in SO dialog 2020-10-30 13:59:47 +05:30
Deepesh Garg
9c67629e28
fix: Ignore cancelled entries instock balance report ()
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-29 19:51:57 +05:30
Marica
7496ac0fe2
Merge branch 'develop' into pr-dn-return 2020-10-28 11:54:01 +05:30
Rushabh Mehta
1dd54e457d
Merge pull request from rmehta/quality-form-cleanup
fix(cleanup): Quality Module, cleanup of forms, dashboards etc.
2020-10-28 11:36:00 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return 2020-10-27 15:34:51 +05:30
marination
67f2c82d90 chore: Test case for Payment Terms in PI from PR 2020-10-27 14:49:43 +05:30
marination
fa085d7f4b fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt 2020-10-27 13:18:30 +05:30
Afshan
bd987e56bc
fix: showing error for wrong filters. ()
* fix: showing error for wrong filters.

* style: formatting translation
2020-10-26 19:37:33 +05:30
Rushabh Mehta
ea49e30bfd fix(cleanup): cleaned up forms 2020-10-26 15:30:52 +05:30
Rohit Waghchaure
103ecec9d4 fixed translation syntax 2020-10-26 12:20:11 +05:30
Rohit Waghchaure
9caac6976c fix: incorrect supplied qty error 2020-10-26 12:19:00 +05:30
rohitwaghchaure
4c688b71f3 fix: consumed qty logic for subcontracted raw materials ()
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
2020-10-26 12:19:00 +05:30
rohitwaghchaure
1cfa61628d fix: incorrect calculation for consumed qty for subcontract item ()
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
2020-10-26 12:19:00 +05:30
Saqib
60212ff9b9
fix: multiple pos issues ()
* fix: point of sale search

* fix: pos fetches expired serial nos

* fix: pos doesn't refresh on route change

* fix: opening balances not set in opening entry

* fix: remove debug statement

* fix: invalid query if no serial no is reserved by pos invoice

* chore: make new order btn primary

* chore: filter warehouse by company

* chore: add shortcuts for new order and email

* fix: cannot fetch serial no if no batch control

* chore: add shortcuts for menu items

* feat: standard keyboard shortcuts for pos page

* feat: display only items that are in stock

* fix: empty point of sale page if opening entry dialog is closed

* feat: conversion factor in pos item details

* fix: show all invalid mode of payments

* chore: show all items if allow negative stock is checked

* fix: -ve amount set when changing mode of payment

* fix: pos closing validations

* fix: test

* fix: non expired serial no fetching query

* fix: cannot dismiss pos opening creation dialog

* fix: transalation strings

* fix: msgprint to throw

* chore: use as_list in frappe.throw

* chore: clean up pos invoice.js & .py

* fix: codacy

* fix: transalation syntax

* fix: codacy

* fix: set_missing_values called twice from pos page

* fix: mode selector with double spaces

* fix: do not allow tables in pos additional fields

* fix: pos is not defined

* feat: set mode of payments for returns

* fix: remove naming series from pos profile

* fix: error message

* fix: minor bugs

* chore: re-arrange pos closing entry detail fields

* fix: sider & frappe linter

* fix: more translation strings

* fix: travis

* fix: more translation strings

* fix: sider

* fix: travis

* fix: unexpected end of string

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
rohitwaghchaure
8be296b343
Merge pull request from rohitwaghchaure/feat-added-balance-serial-no-column-develop
feat: balance serial nos in stock ledger report
2020-10-24 19:04:31 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ()
* fix(Stock Settings): Type/Grammatical fixes in Settings

* fix: grammatical fixes in manufacturing settings

* fix: typo fix in accounting settings

* fix: typo fixes in HR settings

* fix: typo fixes in buying settings

* fix: typo fixes in Selling Settings

* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Apply suggestions from code review

Co-authored-by: Sagar Vora <sagar@resilient.tech>

* Update accounts_settings.json

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
rohitwaghchaure
4eb87ea8e2
Merge pull request from rohitwaghchaure/fix-stock-entry-consumption-issue
fix: incorrect backflush qty in manufacture entry
2020-10-23 15:43:43 +05:30
Rohit Waghchaure
558879fad7 fix: Translation Syntax 2020-10-23 13:42:51 +05:30
Nabin Hait
9ff4a2ebd8
Merge branch 'develop' into feat-added-balance-serial-no-column-develop 2020-10-22 21:40:29 +05:30
Marica
3b1be2b1de
fix: Add Taxes if missing via Update Items ()
* fix: Add Taxes if missing via Update Items

* chore: PO Test for adding tax row via Update Items

* chore: SO Test for adding tax row via Update Items
2020-10-22 17:04:31 +05:30
rohitwaghchaure
cc5171a324
Merge branch 'develop' into stock_entry_conversion_factor 2020-10-22 15:20:32 +05:30
Rohit Waghchaure
fa842e8774 fix: incorrect backflush qty in manufacture entry 2020-10-22 13:35:27 +05:30
Rohit Waghchaure
09572f10f8 fix: overproduction, not allowed to transfer extra materials 2020-10-20 11:01:36 +05:30
Deepesh Garg
8859b71956
fix: Check for backdated validation only for transaction company ()
* fix: Check SLE only for transaction company

* fix: Add tests

* fix: Move backdated entry validation from transaction base to stock ledger entry

* chore: Add tests

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:56:45 +05:30
rohitwaghchaure
3a17147a32
refactor: book loss amount in the COGS instead of stock received but not billed () 2020-10-19 16:54:11 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report ()
* refactor: added new filters in the Batch-wise balance history report

* fix: added semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 11:37:54 +05:30
rohitwaghchaure
5d6686bd8c
Fixed stock ageing report data develop ()
* fix: stock ageing report

* Update stock_ageing.py
2020-10-19 10:39:20 +05:30
Rohit Waghchaure
e6a29cc33a fix: performance issue while adding template item in the cart 2020-10-16 17:59:54 +05:30
Rohit Waghchaure
76fafe8842 feat: balance serial nos in stock leder report 2020-10-16 17:58:54 +05:30
Deepesh Garg
775e689ba9 fix: Add tests 2020-10-15 22:09:05 +05:30
Deepesh Garg
01a7297f69 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-15 17:13:29 +05:30
Rohit Waghchaure
5f465394a7 fix: serial no field is blank in stock reconciliation 2020-10-15 15:56:50 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return 2020-10-13 16:57:11 +05:30
Marica
c5e139a542
fix: Travis ()
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places

* fix: Item Barcode and Test

* fix: Over Receipt on subcontracting test

* fix: POS Invoice and Loyalty Program Tests

* fix: POS serialized item test and subcontracting exploded items in PO

* fix: Subcontracting test considering sourced_by_supplier items

* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
Saqib
ebb0a6266a
fix: last purchase rate in item prices report ()
* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* fix: last purchase rate in item prices report

* chore: fetch last purchase rate from update stock purchase invoices
2020-10-12 17:09:09 +05:30
Marica
e9f0268d32
Merge branch 'develop' into item-attribute-validation-on-non-template-item 2020-10-12 15:26:34 +05:30
Marica
aeba75cd08
Merge branch 'develop' into mr-ux 2020-10-12 15:17:32 +05:30
rohitwaghchaure
4e59abf0bf
Merge pull request from anupamvs/item-price
fix: can't save item price after adding child table
2020-10-12 15:15:50 +05:30
Kevin Chan
f6bcd5c2b2 test: Add test case for duplicate checking 2020-10-12 16:57:33 +08:00
Kevin Chan
58389ebd40 style: Collapse whitespace 2020-10-12 15:20:11 +08:00
marination
03975a692e fix: Perform Item Attribute Value Validation on Variants Only 2020-10-12 12:03:07 +05:30
Kevin Chan
39bed3a65e fix: Add null or empty checking to validation
This commit adds null or empty checking in the **Item Price** DocType's
`check_duplicates()`. This was done to fix a bug where some prices are
shown to be duplciates even though they aren't because they don't have
values in some fields.
2020-10-12 11:42:05 +08:00
Kevin Chan
a322f0d0b3 chore: Fix error message grammar 2020-10-12 11:38:55 +08:00
Anupam
2be23309bb fix: can't add child table in item price 2020-10-11 14:14:50 +05:30
marination
bd6d5eb5ac fix: Remove Production Order reference from Item Validation 2020-10-09 20:57:17 +05:30
Deepesh Garg
8242da6310 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_entry_conversion_factor 2020-10-08 16:23:34 +05:30
michellealva
3525ddabc5 fix: Add links in Stock desk page 2020-10-07 19:02:19 +05:30
marination
c213cd96c5 fix: Handle Blank from/to range in Numeric Item Attribute 2020-10-02 12:22:28 +05:30
marination
0bc61b31f7 chore: Move Qty fields (received qty,etc.) close to Qty/Stock UOM 2020-10-02 11:54:54 +05:30
Sagar Vora
382676d875
Merge branch 'develop' into mr-stock-uom-v13 2020-09-27 20:09:00 +05:30