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

4220 Commits

Author SHA1 Message Date
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