Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,590 Commits 3 Branches 0 Tags 1 GiB
eb6b3cfe6d
Commit Graph

4251 Commits

Author SHA1 Message Date
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 (#23757) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-29 19:51:57 +05:30
prssanna
71e5b60df1 refactor: refactor contextual print setting implementation 2020-10-29 14:19:34 +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 #23734 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. (#23726) 
* 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 (#23314) 
* 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 (#23257) 
* 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 (#23347) 
* 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 #23675 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 (#23612) 
* 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 #23695 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 (#23702) 
* 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
Shivam Mishra
5e00ed926c feat: update icons 2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-21 11:38:31 +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 (#23639) 
* 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 (#23671) 2020-10-19 16:54:11 +05:30
rohitwaghchaure
2fbeb7c1dd
refactor: added new filters in the Batch-wise balance history report (#23676) 
* 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 (#23673) 
* 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
Shivam Mishra
cb8457b9ae feat: add description to Accounts onboarding 2020-10-15 13:53:12 +05:30
Shivam Mishra
55f52e8135 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-10-13 20:09:22 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return 2020-10-13 16:57:11 +05:30
Marica
c5e139a542
fix: Travis (#23606) 
* 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 (#23506) 
* 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 #23583 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
prssanna
fec4ea5643 fix: set stock uom in tem while creating material request from stock entry 2020-09-25 18:01:12 +05:30
Shivam Mishra
9a4d603403 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-09-25 11:44:37 +05:30
Michelle Alva
879a8ef26b
fix: Change button label in Item (#23410) 2020-09-23 15:36:07 +05:30
Deepesh Garg
2bf4245334 fix: Conversion factor fixes in Stock Entry 2020-09-23 12:50:06 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return 2020-09-22 15:39:25 +05:30
rohitwaghchaure
7230b0f9a0
Merge pull request #23360 from anupamvs/batch-wise 
fix: Batch-Wise Balance History filter validation
 2020-09-22 10:32:51 +05:30
Saqib
f2ea3877c8
fix: depreciation start date ux fixes (#23339) 2020-09-20 19:31:18 +05:30
Deepesh Garg
e3ee63f677
Merge pull request #23346 from AfshanKhan/stock-entry-warehouse-address-filter 
fix: warehouse address filtered based on warehouse
 2020-09-19 18:17:08 +05:30
marination
b782d2a99d fix: Added back accidentally deleted field 2020-09-19 01:04:28 +05:30
marination
90d9d80ef9 fix: More MR UX fixes 2020-09-19 00:43:53 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator (#23350) 
* fix: reset owner values in doctype to Administrator

* fix: updated modified value

* fix: also fixed modified by

* fix: change modified_by to Administrator
 2020-09-18 18:27:24 +05:30
Anupam
bf166736b0 fix: Batch-Wise Balance History filter validation 2020-09-18 17:15:49 +05:30
Afshan
d5710b4d6f style: removed extra spaces 2020-09-17 13:01:47 +05:30
Afshan
e813684433 fix: warehouse address filtered based on warehouse 2020-09-17 12:57:26 +05:30
Marica
c4a8c9eb26
Merge branch 'develop' into pr-dn-get-items 2020-09-14 11:09:32 +05:30
marination
9205101ecf fix: Make Reference fields mandatory in Quality Inspection 2020-09-12 16:17:13 +05:30
marination
0a688005be fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-12 15:39:27 +05:30
Suraj Shetty
67095d239f fix: Custom dashboard sections 2020-09-10 17:15:52 +05:30
marination
83a03689a1 fix: Use independent item for DN Test 2020-09-09 20:51:01 +05:30
marination
efb211af6d chore: Fix Received/Delivered Items to Billed Logic 2020-09-09 16:24:11 +05:30
Marica
52e87d1a4f
Merge branch 'develop' into pr-dn-return 2020-09-09 11:56:26 +05:30
marination
8484d1cd95 fix: Patch and test codacy 2020-09-08 20:58:33 +05:30
marination
315bf3051c chore: Tests for Delivery Note 2020-09-08 19:27:36 +05:30
marination
e35fd5e305 chore: Tests for Purchase Receipt 2020-09-08 16:24:10 +05:30
Afshan
9691422fb7
feat: added report for mismatch in serial nos and stock quantity in warehouse (#22669) 
* feat: added report for mismatch in serial nos and stock quantity in warehouse

* style: removed print statement

* fix: rename of reports and refactor of code

* fix: handled null condition for actual qty and added report link in stock desk page

* style: breaking code in multiple lines
 2020-09-08 11:57:15 +05:30
Marica
0411026ad6
Merge branch 'develop' into pr-dn-return 2020-09-08 10:48:44 +05:30
rohitwaghchaure
515d8b9e50
Merge pull request #23259 from anupamvs/se-quntity 
fix: SE quantity data type issue
 2020-09-04 16:07:13 +05:30
Anupam K
faebef21b7 fix: SE quantity data type issue 2020-09-04 15:09:16 +05:30
Rohit Waghchaure
68b0108301 fix: incorrect qty after transaction in stock ledger entry 2020-09-03 15:10:07 +05:30
marination
731bae170e fix: Test for Over Receipt via PRs on a PO 2020-08-28 14:09:02 +05:30
Suraj Shetty
f39bb116cc Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-27 19:27:49 +05:30
prssanna
a324e9bd12 fix: remove text-muted and small class fromtree items 2020-08-27 19:26:14 +05:30
Suraj Shetty
b6ebcd7559 refactor: Replace darkgray indicator with gray indicator 2020-08-27 18:57:18 +05:30
prssanna
744169833c fix: replace indicator color darkgrey with darkgray 2020-08-27 17:06:10 +05:30
Shivam Mishra
7556517a4f
feat: validate if removed item attributes exist in variants (#22911) 
* feat: validate if removed item attributes exist in variants

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* Update erpnext/stock/doctype/item/item.py

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: smaller loop

Co-authored-by: marination <maricadsouza221197@gmail.com>

* feat: don't run validation for new entries

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: use tuple as is

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: error description

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* refactor: remove unused variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-24 19:37:09 +05:30
rohitwaghchaure
cf4268e21a
Merge pull request #23116 from nabinhait/subcontracted-pr-gle 
fix: GLE for subcontracted PR is fg item rate is zero
 2020-08-24 16:07:32 +05:30
Deepesh Garg
8331a38ace fix: Test Case for qty less than 1 2020-08-23 21:23:26 +05:30
Deepesh Garg
cb0bc2dcaf fix: Negative SLE not created for fraction qty or qty less than 1 2020-08-23 20:43:50 +05:30
Suraj Shetty
a43e760703 fix: Item dashboard style 2020-08-23 16:36:28 +05:30
Suraj Shetty
6f9f40992c Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-08-23 16:33:50 +05:30
Nabin Hait
337ee0a4bf test: Test case for GLE in subcontracted PR if FG item rate is zero 2020-08-22 20:02:27 +05:30
Nabin Hait
df175cc8fc fix: GLE for subcontracted PR is fg item rate is zero 2020-08-22 19:17:18 +05:30
Anupam Kumar
674d1b0803
feat: Material Request and Stock Entry Enhancement (#22671) 
* feat: send to warehouse

* adding warehouse validation

* fix: review changes

* fix: review changes

* stock entry enhancement

* fix: review changes
 2020-08-12 17:55:02 +05:30
Rucha Mahabal
e0cc421e50
fix: TypeError while setting transfer_qty in Stock Entry (#22929) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-12 14:33:30 +05:30
Shivam Mishra
2fe5d76fe4
Merge branch 'develop' into item-image-alt 2020-08-11 14:45:55 +00:00
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return (#22942) 
* feat: adding return naming series

* Update purchase_invoice.json

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-11 16:11:20 +05:30
Shivam Mishra
ded9f41cce
refactor: update confusing label 2020-08-10 12:45:07 +05:30
Shivam Mishra
b1f8859121 feat: add alt value in product page 2020-08-07 14:38:40 +05:30
Shivam Mishra
ba4c4f107e feat: add image alt field in items 2020-08-07 14:34:28 +05:30
Afshan
085061fa21
fix: show or hide section or attributes depending on other attributes… (#22861) 
* fix: show or hide section or attributes depending on other attributes for better UI

* Update erpnext/stock/doctype/item/item.js

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: made has_variants checkbox to read_only if stock_exists

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-08-06 14:36:34 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Marica
e211bb7a53
fix: Reposition description in Warehouse (#22895) 2020-08-03 20:40:09 +05:30
Marica
dd97524db5
fix: Misleading description in Warehouse (#22877) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-08-03 14:55:40 +05:30
marination
d36df92750 fix: Codacy and repositioned Returned Qty in DN Item 2020-07-31 20:22:55 +05:30
marination
ba37fe796c chore: Delivery Note Return status 2020-07-31 20:01:06 +05:30
marination
66069df020 feat: Return tracking in PR/DN 2020-07-31 15:54:05 +05:30
Shivam Mishra
11111cd9a9 Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui 2020-07-30 21:29:02 +05:30
Prssanna Desai
9e81bb9a11
fix: add range filters to oldest items chart (#22842) 2020-07-29 17:28:30 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items (#22648) 
* fix: Unable to submit backdated stock transactions for different items

* fix: Test cases

* fix: Test Cases

* fix: Test Cases

* fix: Test for stock account JV

* fix: Journal Entry Test
 2020-07-28 08:49:44 +05:30
Afshan
73b86d241c fix: conversion to float 2020-07-23 21:09:27 +05:30
Afshan
13d2a34548 Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing 
Merge remote-tracking branch 'upstream' into add-age-range-in-stock-ageing
 2020-07-23 20:35:21 +05:30
Afshan
7965f655a2 Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing 
Merge branch 'add-age-range-in-stock-ageing' of https://github.com/AfshanKhan/erpnext into add-age-range-in-stock-ageing
 2020-07-23 20:33:43 +05:30
Afshan
775fbe74c5 fix: fixed the logic 2020-07-23 20:33:07 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields (#22732) 
* new parent updating logic, made requested changes

* fix: Increase Length of In Words fields

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 19:01:31 +05:30
Nabin Hait
9389b3625a
Merge branch 'develop' into add-age-range-in-stock-ageing 2020-07-23 18:53:00 +05:30
Saqib
a6f98d48bc
refactor: POS workflow (#20789) 
* refactor: add pos invoice doctype replacing sales invoice in POS

* refactor: move pos.py to pos invoice

* feat: add pos invoice merge log doctype

* feat: ability to merge pos invoices into a sales invoice

* feat: [wip] new ui for point of sale

* fix: pos.py moved to pos_invoice

* feat: loyalty points for POS Invoice

* fix: loyalty points on merging

* feat: return against pos invoices

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: status fix and set warehouse from pos profile

* fix: naming series

* feat: merge pos returns into credit notes

* feat: add pos list action for merging into sales invoices

* feat[UX]: add shortcuts & focus on search after customer selection

* feat: stock validation from previous pos transactions

* Merge 'fork/serial-no-selector' into refactor-pos-invoice

* chore: fix df not found for base_amount precision

* feat: serial no validation from previous pos transactions

* chore: move pos.py into pos page

* feat: pos opening voucher

* feat: link pos closing voucher with opening voucher

* chore: use map_doc instead of get_mapped_doc for better perf

* feat: enforce opening voucher on pos page

* feat: [ui] [wip] point of sale beta ui refactor

* fix: auto fetching serial nos with batch no

* feat: [ui] item details section for new pos ui

* feat: remove item from cart

* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids

* fix: search from item selector

* feat: loyalty points as payment method

* feat: pos invoice status
* fix a bug with invalid JSON

* fix: loyalty program ui fixes

* feat: past order list and past order summary

* feat: (minor) setting discount from item details

* fix: adding item before customer selection

* feat: post order submission summary
* save and open draft orders
* fix: item group filter

* fix:  item_det not defined while submitting sle

* fix: minor bugs

* fix: minor ux fixes

* feat: show opening time in pos ui

* feat: item and customer images

* feat: emailing and printing an invoice

* fix: item details field edit shows empty alert

* fix: (minor) ux fixes

* chore: rename pos opening voucher to pos opening entry

* chore: (minor) rename pos closing voucher and sub doctypes

* chore: add patch for renaming pos closing doctypes

* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation

* fix: invoices not getting fetched on pos closing

* fix: indentation

* feat: view / edit customer info

* fix: minor bugs

* fix: minor bug

* fix: patch

* fix: minor ux issues

* fix: remove uppercase status

* refactor: pos closing payment reconciliation

* fix: move pos invoice print formats to pos invoice doctype

* fix: ui issues

* feat: new child doctype to store pos payment mode details

* fix: add to patches.txt

* feat: search by serial no

* chore: [wip] code cleanup

* fix: item not selectable from cart

* chore: [wip] code cleanup

* fix: minor issues
* loyalty points transactions
* default payment mode

* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI

* chore: pos invoice merge log tests

* fix: batch / serial validation in pos ui and on submission

* feat: use onscan js for barcode scan events

* fix: cart header with amount column

* fix: validate batch no and qty in pos transactions

* chore: do not fetch closing balances as opening balance

* feat: show available qty in item selector

* feat: shortcuts

* fix: onscan.js not found

* fix: onscan.js not found

* fix: cannot return partial items

* fix: neagtive stock indicator

* feat: invoice discount

* fix: change available stock on warehouse change

* chore: cleanup code

* fix: pos profile payment method table

* feat: adding same item with different uom

* fix: loyalty points deleted after consolidation

* fix: enter loyalty amount instead of loyalty points

* chore: return print format

* feat: custom fields in pos view

* chore: pos invoice test

* chore: remove offline pos

* fix: cyclic dependency

* fix: cyclic dependency

* patch: remove pos page and order fixes

* chore: little fixes

* fix: patch perf and plural naming

* chore: tidy up pos invoice validation

* chore: move pos closing to accounts

* fix: move pos doctypes to accounts

* fix: move pos doctypes to accounts

* fix: item description in cart

* fix: item description in cart

* chore: loyalty tests
* minor fixes

* chore: rename point of sale beta to point of sale

* chore: reset past order summary on filter change

* chore: add point of sale to accounting desk

* fix: payment reconciliation table in pos closing

* fix: travis

* Update accounting.json

* fix: test cases

* fix: tests
* patch loyalty point entries

* fix: remove test
* default mode of payment is mandatory for pos transaction

* chore: remove unused checks from pos profile

* fix: loyalty point entry patch

* fix: numpad reset and patches

* fix: minor bugs

* fix: travis

* fix: travis

* fix: travis

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 18:51:26 +05:30
Marica
3c8c346227
fix: Pick List empty table and Serial-Batch items handling (#22426) 
* chore: Pick List empty table and serial-batch items handling

* fix: Remove console statement

* chore: Added tests for batched and batched-serialised item
 2020-07-23 17:52:06 +05:30
Shivam Mishra
1358efe896 feat: update icons 2020-07-23 17:02:32 +05:30
Afshan
767ee1cdb8 fix: logic to get other items also other than just 1st one 2020-07-23 15:39:27 +05:30
rohitwaghchaure
d45ff31ff0
fix: incorrect stock after merging the items (#22526) 
* fix: incorrect stock after merging items

* fix: Readability fix

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-22 18:24:01 +05:30
Marica
514366654e
fix: Serial No Rename does not affect Stock Ledger Entry (#22746) 
* Revert "fix: Remove rename related code from Serial No (#22627)"

This reverts commit 1ec2d962db.

* fix: Rename fails on Stock Ledger Entry

* fix: Allow Rename in Serial No
 2020-07-22 16:40:24 +05:30
Marica
53646cb360
chore: Export Stock Dashboard (#22768) 2020-07-22 16:17:40 +05:30
Afshan
871889220b
style: moved parent warehouse to top section also added a section bre… (#22708) 
* style: moved parent warehouse to top section also added a section break for better look

* style: changes display depends on for HTML field

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-21 20:39:00 +05:30
Afshan
66d4b42df0
fix: update set query for warehouse after changing the company (#22632) 
* fix: update set query for warehouse after changing the company

* fix: changed set_query to get_query

* fix: variable filter doesn't get updated once set on load hence removed

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-21 19:59:30 +05:30
rohitwaghchaure
f4db8c1c11
Merge pull request #22724 from rohitwaghchaure/fixed-incorrect-currency-symbol-in-stock-balance-report-develop 
fix: currency symbol not showing as per company currency in stock balance report
 2020-07-17 16:56:22 +05:30
Rohit Waghchaure
2347e69cb9 fix: for past dated stock reco, batched item showing the current available qty instead of quantity as per posting date 2020-07-17 14:50:49 +05:30
Rohit Waghchaure
848568d023 fix: currency symbol not showing as per company currency in stock balance 2020-07-17 14:49:12 +05:30
michellealva
d02465a68f fix: Update modified timestamp for Delivery Note Item 2020-07-17 10:35:16 +05:30
Rohit Waghchaure
132376750c fix: incorrect balance qty in stock ledger report 2020-07-15 17:23:17 +05:30
rohitwaghchaure
30030230bf
Merge pull request #22675 from marination/material-request-warehouse 
fix: Dont overwrite default warehouse in Material Request
 2020-07-15 15:35:38 +05:30
Rohit Waghchaure
e1b3f16abd fix: project field added two time in purchase receipt 2020-07-15 12:28:19 +05:30
marination
392f323d2d fix: Dont overwrite default warehouse in Material Request 2020-07-14 17:03:17 +05:30
Marica
82a606d04b
fix: Added Project Field in Purchase Receipt for Stock Ledger Tagging (#22666) 2020-07-14 13:16:28 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
ccf6b5f640 Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing 
Merge remote-tracking branch 'upstream/develop' into add-age-range-in-stock-ageing
 2020-07-13 11:45:33 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test 
fix(travis): Item Tax template test
 2020-07-11 21:04:31 +05:30
Deepesh Garg
46bcb46422 fix: Do not use random customers 2020-07-11 18:36:32 +05:30
Deepesh Garg
f15ff5fbfa fix: Test 2020-07-11 13:58:53 +05:30
rohitwaghchaure
d14666e419
fix: incorrect delivered qty in Supplier-Wise Sales Analytics (#22631) 2020-07-09 20:07:10 +05:30
Marica
1ec2d962db
fix: Remove rename related code from Serial No (#22627) 2020-07-09 20:02:18 +05:30
Afshan
a629c9e1bc style: remove import comment 2020-07-08 19:28:28 +05:30
Afshan
d16d0efde5 feat: added range for age in stock ageing 2020-07-08 19:23:13 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding (#22580) 
* fix: grammatical fixes in module onboarding

* fix: more grammatical changes for consistency

* fix: Reorder Stock Onboarding

* fix: update success message

* fix: change order of stock onboarding steps

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
rohitwaghchaure
fae570e0a2
Merge pull request #22612 from netchampfaris/fix-item-price-labels 
fix: Remove trailing spaces from labels
 2020-07-08 12:14:21 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop 
fix: Item Tax Template permissions as per company
 2020-07-08 10:08:53 +05:30
Faris Ansari
8c5c74ca06 fix: Remove trailing spaces from labels 2020-07-08 09:20:13 +05:30
marination
32f3d24dac fix: Employee benefit application & quality inspection whitelist 2020-07-07 14:31:49 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
mohammadahmad1990
261ecba3d6 Company field removed from Item Taxes Table 2020-07-03 15:04:28 +05:00
mohammadahmad1990
ad3d44d622 fix: Item Tax Template check on company field 2020-07-03 15:02:39 +05:00
mohammadahmad1990
e39649bc9e fix: Item Tax Template with no validity 2020-07-03 15:02:03 +05:00
mohammadahmad1990
41c0c9f46b fix: Item Tax Template 2020-07-03 15:01:49 +05:00
Andy Zhu
b60abb0158
fix: fetch item price in sales invoice 
When create standalone sales invoice, the item price will not be created fetch.
By adding "posting_date" to dict: item_price_args, it will be fetch on building the condition of SQL.
 2020-07-03 14:13:15 +12:00
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default (#22521) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-02 15:11:45 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Marica
8732b8caf6
fix: Stock Onboarding typo and reorder (#22499) 2020-06-29 17:38:42 +05:30
rohitwaghchaure
4cc2e70348
Merge pull request #22454 from wojosc/patch-10 
refactor: update customs_tariff_number.json
 2020-06-28 15:07:19 +05:30
Wolfram Schmidt
a97715e464
Update customs_tariff_number.json 2020-06-26 10:24:48 +02:00
Wolfram Schmidt
7f2a3e8c7d
Update customs_tariff_number.json 
Main information of tariff numbers are the number. A description is more or less double information as this is mostly the number. Thus a description should not be mandetory.
 2020-06-25 13:56:32 +02:00
marination
f311f52f6e fix: Disable Renaming in Serial No 2020-06-25 16:02:18 +05:30
John Clarke
6fd1068af3
Update stock_ageing.py 2020-06-24 07:31:21 -06:00
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting 2020-06-24 10:23:23 +05:30
mergify[bot]
ca8894b0fc
fix: alternative item not working for subcontract (#22386) 
(cherry picked from commit 171699537c3e7d7632f45123c6d30012c8de7281)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-06-23 10:42:32 +05:30
Marica
bd5c8573de
fix: Unable to create batched Item (#22393) 2020-06-23 10:32:51 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7 fix: Test Cases 2020-06-22 09:40:15 +05:30
Deepesh Garg
c70eb30e7e Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting 2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb fix: Move check from Stock Settings to Company Master 2020-06-20 11:55:56 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding (#22055) 
* feat: Selling Desk, Dashboard and Onboarding

* chore: Selling Onboarding and fixes in Other onboardings

* chore: Dashboard and Number card Fixtures

* fix: Escape filters and Reposition Accounts Dashboard shortcut.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-06-19 15:33:21 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis 
fix: Travis(develop)
 2020-06-15 16:12:10 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address 
fix: Billing address in for Purchase documents
 2020-06-14 15:10:43 +05:30
Deepesh Garg
6760077674 fix: Billing address in for Purchase documents 2020-06-13 22:40:23 +05:30
John Clarke
15e4ea0472
Merge branch 'develop' into clarkejj-patch-1 2020-06-12 07:55:49 -06:00
John Clarke
85f237257a
Thanks so much for your pointer Marica - that violation is clear and obvious to me in retrospect, but a good relearning experience in any case 2020-06-12 07:22:14 -06:00
Deepesh Garg
c258ac82c5 feat: Accounting entries for service item in Purchase receipt 2020-06-12 18:33:42 +05:30
John Clarke
677978dd00
Update stock_ageing.py 
As reviewer Deepesh Garg advised thanks!  batch[0] can be int of float - see line 49 - so change proposed cint to flt
 2020-06-12 05:53:24 -06:00
Alirio Castro
faf33072c8 fix: key was mispelled 2020-06-11 23:32:53 -04:00
John Clarke
6b55f66f02
Stock Ageing TypeError: ‘<’ not supported between instances of ‘int’ and ‘str’ 
Proposed fix re this error report https://discuss.erpnext.com/t/stock-ageing-report-typeerror-not-supported-between-instances-of-int-and-str/62605
 2020-06-11 10:24:48 -06:00
Deepesh Garg
9df4532d14 fix: Travis(develop) 2020-06-11 21:33:43 +05:30
Rohan
d60d2e1826
fix: only auto-set serial nos and batches if allowed in Stock Settings (develop) (#21781) 
* fix: only auto-set serial nos and batches if allowed in Stock Settings

* fix: bug with setting disabled batch no in Pick List

* fix: remove auto-set batch variable

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-06-10 19:10:56 +05:30
rohitwaghchaure
3a9c1b23db
Merge pull request #22096 from marination/valuation-rate 
fix: '>=' not supported between instances of 'str' and 'int'
 2020-06-10 14:12:13 +05:30
marination
f5b9deea5b fix: Finished Product Valuation at Repack 2020-06-08 13:02:00 +05:30
Deepesh Garg
407c7bc113
Merge pull request #22067 from marination/item-attribute 
fix: Misleading Error message for Item Attribute.
 2020-06-05 11:21:08 +05:30
P-Froggy
6f87f97efe
fix: Wrong Ordered-Status Indicator for Material Request Items (#22118) 
The indicator displaying if a material request item has been ordered or not (green/orange) used the wrong quantity field for determining the status.
The qty field used in the code is not in stock uom while the ordered_qty field is.
Now, the stock_qty field is used for correct comparison with ordered_qty.
 2020-06-05 10:57:07 +05:30
marination
6f7e9d2904 fix: '>=' not supported between instances of 'str' and 'int' 2020-06-03 17:13:58 +05:30
Myuddin khatri
9276d16420 fix(stock): able to create purchase invoice from purchase receipt dashboard 
able to create purchase invoice from purchase receipt dashboard
 2020-06-03 11:22:49 +05:30
marination
0df7f0fe9d fix: Misleading Error message for Item Attribute. 2020-06-01 11:56:33 +05:30
Deepesh Garg
c96bf870e4 fix: Test Cases 2020-05-30 11:46:39 +05:30
Deepesh Garg
36f7710356 Revert "fix: tests depending on global default company" 
This reverts commit 1f20c99ecf.
 2020-05-30 11:38:04 +05:30
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes (#21965) 
* fix: Buying Module fixes

* fix: Delete Report files as well

* fix: Add Purchase Order Analysis to Stock & Accounting
 2020-05-27 20:56:39 +05:30
Marica
a49f045d14
fix: Grammar fixes (#21970) 2020-05-27 20:28:37 +05:30
Rohan
d28854b3c2
fix: throw error if no serial numbers are found in Pick List (#21915) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-26 18:13:25 +05:30
Marica
74a910ae92
fix: title for onboarding step (#21933) 
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
 2020-05-26 17:49:34 +05:30
Marica
07f305a1d6
refactor: open link in new tab (#21910) 2020-05-25 16:30:59 +05:30
Rohan
e5395c3ae8
fix: filter batches based on item and warehouse in Pick List (#21780) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-25 15:25:21 +05:30
Marica
dd3e52184c
fix: Added Inactive serial no status (#21848) 2020-05-22 10:48:35 +05:30
rohitwaghchaure
7978907cc8
feat: BOM template (#21262) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-21 18:10:13 +05:30
marination
7afee887a8 fix: Fetch customer into Delivery Note from Pick List 2020-05-21 13:11:48 +05:30
Nabin Hait
939441117a Merge branch 'marination-purchase-dashboard' into develop 2020-05-19 20:22:48 +05:30
Nabin Hait
e005078c0d feat: buying module dashboard and onboarding 2020-05-19 20:22:25 +05:30
rohitwaghchaure
aa85e511da
feat: Production Planning Against Sales Order/Material Request/Work Order (#21763) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-19 19:51:45 +05:30
Nabin Hait
ddec05ee07 Merge branch 'marination-stock-dashboard' into develop 2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721 feat: stock module dashboard and onboarding 2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text (#21782) 2020-05-19 19:05:42 +05:30
Marica
e50ca69bb9
Merge branch 'develop' into stock-dashboard 2020-05-19 14:39:31 +05:30
marination
658f29915a fix: PR and DN trend report charts, group by fixes 2020-05-19 13:58:13 +05:30
marination
64b36dba4f fix: Changed Form Tour order and grammar fixes. 2020-05-19 13:27:10 +05:30
marination
a5fcaf66f9 fix: Added filters in number Cards 2020-05-19 13:05:22 +05:30
Rohit Waghchaure
34f4a2398b feat: manufacturing dashboards 2020-05-18 11:57:25 +05:30
rohitwaghchaure
8e3fc5ee6e
fix: incorrect stock valuation for repack entry (#21736) 2020-05-17 20:28:39 +05:30
rohitwaghchaure
5cfbdf4bcb
fix: user not able to view product (#21740) 2020-05-15 19:36:23 +05:30
marination
be5c45a9ae chore: Fixtures and empty state handling in chart widgets 2020-05-15 13:21:58 +05:30
Saqib
41b47a68b3
fix: item price not fetching when customer is unset in item price (#21488) 
* fix: item price not fetching when customer is unset in item price

* fix: item price of selling type has hidden supplier value

* fix: remove test variable

* fix: test

* patch: invalid customer/supplier based on item price type

* fix: invalid query

* fix: patch

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-15 04:24:36 +05:30
marination
3f7678416f chore: Stock Onboarding 2020-05-15 04:13:02 +05:30
marination
bb95cd5fd8 chore: Added Dynamic Charts to DN and PR Trends Reports 2020-05-15 01:33:43 +05:30
marination
10bd2417ff feat: Custom Dashboard 'Warehouse wise Stock Value' with Chart Source 2020-05-14 15:35:18 +05:30
marination
021acd0a01 chore: Stock Ageing and Item Shortage Reports with Charts 2020-05-14 13:20:43 +05:30
Marica
97715f2877
fix: Message for missing valuation rate (#21686) 2020-05-11 20:45:37 +05:30
Deepesh Garg
ece1b4bc5a
Merge pull request #21676 from rohitwaghchaure/fixed-qty-validation-in-stock-entry 
fix: '<' not supported between instances of 'str' and 'int'
 2020-05-11 12:27:20 +05:30
Rohit Waghchaure
3a914a7cd7 fix: '<' not supported between instances of 'str' and 'int' 2020-05-11 11:44:45 +05:30
marination
65123d2adc fix: Item Barcode stays the same after updation. 2020-05-08 16:30:46 +05:30
rohitwaghchaure
8b9574d434
Merge pull request #21657 from rohitwaghchaure/fixed-stock-and-account-value-comparison-report 
fix: local variable 'lft' referenced before assignment
 2020-05-08 15:39:24 +05:30
Rohit Waghchaure
074ea2f882 fix: local variable 'lft' referenced before assignment 2020-05-08 15:33:35 +05:30
rohitwaghchaure
9de26f6648
fix: list index out of range (#21613) 2020-05-07 12:06:47 +05:30
Marica
5e3d8050aa
fix: Handle rows with same item code from Purchase Receipt to Invoice. (#20724) 
* fix: Handle rows with same item code from Purchase Receipt to Invoice.

* fix: Added patch, fixed tests, fixed delivery note behaviour

* chore: Added comments amd fixed typo

* fix: Added patch to patches.txt

* fix: Patch fix and simplification, json timestamp updation.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-05-05 14:37:39 +05:30
Deepesh Garg
6df581f78b
Merge pull request #21375 from marination/commonify-warehouse-autofill 
chore: Commonify auto-filling warehouses in child tables
 2020-05-03 20:33:45 +05:30
rohitwaghchaure
268df35d80
Merge pull request #21516 from marination/stock-balance-cleanup 
chore: Added company filter and minor cleanup in Stock Balance Report
 2020-05-03 16:31:34 +05:30
Nabin Hait
da17f9cb05
feat: Run MRP at parent level in the production plan (#21545) 
* enhance: provision to make material request from other location

* fix: source warehouse for material transfer from production plan

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2020-05-01 18:16:25 +05:30
Deepesh Garg
998364d636
fix: Update timestamp 2020-05-01 12:04:13 +05:30
Deepesh Garg
6cce75a230
Revert "fix: Update in field type" 2020-05-01 12:03:18 +05:30
Deepesh Garg
e2de2923e2
Merge pull request #21420 from wojosc/patch-8 
fix: Update in field type
 2020-05-01 11:38:23 +05:30
rohitwaghchaure
be16e5cccc
fix: 'NoneType' object is not iterable (#21537) 2020-05-01 10:50:17 +05:30
marination
3568dc75be fix: Make Company the first filter 2020-05-01 00:01:37 +05:30
marination
89c41d8384 chore: Added company filter and minor cleanup in Stock Balance Report 2020-04-30 13:56:49 +05:30
Deepesh Garg
758f0f0780
Merge branch 'develop' into patch-8 2020-04-30 11:37:27 +05:30