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

3571 Commits

Author SHA1 Message Date
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:26 +05:30
Anupam
0358b64743 fix: featching serialized items 2021-05-31 15:59:32 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
rohitwaghchaure
6809ff4f64
Merge pull request #25776 from rohitwaghchaure/fixed-warehouse-not-found-issue 
fix: warehouse not found in stock entry
 2021-05-24 17:00:06 +05:30
rohitwaghchaure
ce88c945cd
Update stock_entry.js 2021-05-24 11:53:27 +05:30
Suraj Shetty
81d49e9c71 fix: Use extend_cscript function to properly extend class methods to cscript 2021-05-21 17:03:09 +05:30
Alan
1097dc89c5
fix: show allow zero valuation only when auto checked (#25778) 2021-05-21 14:04:03 +05:30
Rohit Waghchaure
795909fdcd fix: warehouse not found in stock entry 2021-05-21 11:31:01 +05:30
rohitwaghchaure
94a52c0e17
Merge pull request #25752 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running 
fix: the status of repost item valuation showing In Progress since long time
 2021-05-21 09:50:33 +05:30
rohitwaghchaure
84730aa4a5
Merge pull request #25754 from rohitwaghchaure/fixed-do-not-repost-if-scheduler-is-in-running-13 
fix: the status of repost item valuation showing In Progress since long time
 2021-05-21 09:50:18 +05:30
Rohit Waghchaure
5456873641 fix: run scheduler for reposting if there is no scheduler is running for the reposting 2021-05-19 12:30:28 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild 2021-05-18 14:48:28 +05:30
noahjacob
41ac8be6f2 refactor: base_amount field moved below amount field and renamed 2021-05-17 13:58:27 +05:30
Rohit Waghchaure
0517abad43 fix: run scheduler for reposting if there is no scheduler is running for the reposting 2021-05-17 13:31:12 +05:30
Nabin Hait
8b2fef11b1 fix: merge conflict 2021-05-17 11:37:14 +05:30
Alan
55c2fec683
feat: add pending qty section to batch/serial selector dialog (#25519) 
* feat: add pending qty section to batch/serial selector dialog

* fix: call attach in setup and refresh, fix conditional

* refactor: camel to snake casing
 2021-05-14 12:36:41 +05:30
rohitwaghchaure
2aa401826e
fix: validation message of quality inspection in purchase receipt (#25666) 2021-05-14 12:34:50 +05:30
rohitwaghchaure
e9f6c8cdb1
fix: validation message of quality inspection in purchase receipt (#25667) 2021-05-14 12:34:13 +05:30
Deepesh Garg
be3cde9313
chore: Code clean up for purchase receipt GL (#25379) 
* chore: Code clean up for purchase receipt GL

* fix: add params for debit and credit in account curreny

* chore: Asset GL entry code cleanup

* fix: Syntax error

* fix: Update variable names

* fix: function naming

* fix: Add undefined variables

* fix: Supplier warehouse fetching

* fix: Linting issues
 2021-05-14 12:20:38 +05:30
rohitwaghchaure
ba940bb9e1
Merge pull request #25702 from rohitwaghchaure/change-today-to-now-for-reposting 
fix: change today to now to get data for reposting
 2021-05-13 17:44:38 +05:30
rohitwaghchaure
fc44478810
Update repost_item_valuation.py 2021-05-13 17:42:33 +05:30
Rohit Waghchaure
a0a88a710e fix: change today to now to get data for reposting 2021-05-13 17:42:06 +05:30
Rohit Waghchaure
af1376c1df chore: change today to now to get data for reposting 2021-05-13 17:39:49 +05:30
Rohit Waghchaure
27f50d5852 fix: timeout error while loading warehouse tree 2021-05-13 15:54:35 +05:30
Rohit Waghchaure
d984be0ccd fix: don't map set warehouse from delivery note to purchase receipt 2021-05-12 12:32:14 +05:30
Suraj Shetty
404e7d07c5 test: Fix permission error 2021-05-10 18:39:09 +05:30
Suraj Shetty
4d6d5f4d89 test: Fix valuation rate for raw materials 2021-05-10 17:37:44 +05:30
Suraj Shetty
a132de42ca fix: allow_zero_valuation_rate for rejected qty 2021-05-10 17:25:21 +05:30
Suraj Shetty
ec6b652cd4 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-10 09:18:25 +05:30
Ganga Manoj
aa9e172091
feat: Add Create Expense Claim button in Delivery Trip (#25526) 
* feat(Delivery Trip): Add employee_code field

* feat(Expense Claim): Add Delivery Trip Number field

* feat(Delivery Trip): Add Create Expense Claim button

* feat(Delivery Trip): Make Create Expense Claim button show up after save

* fix(Delivery Trip): Fix Sider issues

* fix(Delivery Trip): Display button after submit

* fix(Delivery Trip & Expense Claim): Rename new fields

* fix(Delivery Trip): Add button in refresh

* fix(Delivery Trip): Remove redundant line

* fix(Expense Claim): Display delivery_trip only if non-empty

* fix(Delivery Trip): Add test for Create Expense Claim

* fix(Delivery Trip): Fix Sider Issue

* fix(Delivery Trip): Only display Create Expense Claim if the driver is an employee

* fix(Delivery Trip): Fix test

* fix(Delivery Trip): Fix make_expense_claim()

* fix: sider

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-08 17:15:33 +05:30
rohitwaghchaure
64bd4f27b8
Merge pull request #25611 from rohitwaghchaure/validation-to-check-duplicate-serial-nos 
fix: added validation in stock entry to check duplicate serial nos
 2021-05-07 23:30:27 +05:30
rohitwaghchaure
1726ce547c
Merge pull request #25471 from rohitwaghchaure/allow-to-receipt-same-serial-no 
fix: allow to receive same serial numbers multiple times
 2021-05-07 23:27:50 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button (#25413) 
* feat!: add pick batch button

BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* refactor: use setup_serial_or_batch_no instead of setup_serial_no

* style: add sider review changes

* refactor: make consice, extract function

* refactor: camel to snake casing
 2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual (#25613) 
* chore: replace assertEquals with alias assertEqual

assertEquals has been deprecated.

ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases

* chore: sider fixes
 2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e Merge remote-tracking branch 'upstream/develop' into esbuild 2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447 fix: Update bundle paths 2021-05-07 14:53:42 +05:30
Ganga Manoj
5618ce3852
fix(Material Request): Add 'Partially Received' to Status drop-down list (#24857) 
Co-authored-by: Ganga Manoj <ganga_manoj@Gangas-MacBook-Air.local>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-05-07 13:35:09 +05:30
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor (#25534) 
* stock and accounts settings page

* fix: Stock and accounts settings page cleanup

Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
 2021-05-07 12:28:57 +05:30
Nabin Hait
7481f54e0c Merge branch 'version-13' into develop 2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard (#25606) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard (#25605) 
* perf: Performance enhancement on setup wizard

* fix: create departments without updating nsm
 2021-05-06 19:13:54 +05:30
Rohit Waghchaure
695becdd05 fix: added validation in stock entry to check duplicate serial nos 2021-05-06 18:03:32 +05:30
rohitwaghchaure
dc6233b703
Merge pull request #25541 from rohitwaghchaure/fixed-incorrect-serial-no-set 
fix: serial no changed after saving stock reconciliation
 2021-05-06 17:44:36 +05:30
Rohit Waghchaure
bb3e5d00f4 fix: allow to receive same serial numbers multiple times 2021-05-06 12:38:35 +05:30
Rohit Waghchaure
c432766a70 fix: stock reconciliation getting time out error during submission 2021-05-05 10:16:21 +05:30
rohitwaghchaure
1f4df80565
Merge pull request #25531 from noahjacob/fix_mr_filter 
fix: updated item filters for material request
 2021-05-03 18:36:25 +05:30
Rohit Waghchaure
8f34ca4ac6 fix: stock reconciliation getting time out error during submission 2021-05-03 15:32:13 +05:30
rohitwaghchaure
9cc7c294e7
Update stock_reconciliation.py 2021-05-03 10:25:53 +05:30
Rohit Waghchaure
35d4829383 fix: serial no changed after saving stock reconciliation 2021-05-02 17:57:28 +05:30
noahjacob
a90c81626f fix: updated item filters for material request 2021-04-30 15:49:36 +05:30