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

40399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ganga Manoj
209750d036
Merge branch 'develop' into depr-expense-account 2021-11-25 20:01:58 +05:30
Ganga Manoj
43b8936f1c
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-25 20:01:06 +05:30
Ganga Manoj
a1055d6bd3
Merge branch 'develop' into product-bundle-fixes 2021-11-25 20:00:30 +05:30
Ankush Menat
87f2dcfb59
fix: total stock summary UI glitch #28564 
fix: total stock summary UI glitch
 2021-11-25 19:38:44 +05:30
GangaManoj
efac7b0904 fix: Create setUpClass 2021-11-25 19:02:01 +05:30
GangaManoj
eea80b6c01 fix: Create stock item 2021-11-25 19:01:22 +05:30
GangaManoj
c9e79ef1f2 fix: Replace 'item' with 'item_code' in tests 2021-11-25 18:53:48 +05:30
Ankush Menat
8b33358660 fix: patch failure due to new doctype 2021-11-25 17:41:29 +05:30
Ankush Menat
0a2964dc82 fix: ignore permissions while creating reposts 2021-11-25 16:37:19 +05:30
Ankush Menat
ed94f0f3f2 refactor: deduplicate during repost background job 2021-11-25 16:37:19 +05:30
Ankush Menat
55631dd0d6 test: item-wh deduplication in reposting 2021-11-25 16:37:19 +05:30
Ankush Menat
0d0e24a5f5 perf: skip unnecessary item-wh reposts 
Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.
 2021-11-25 16:37:19 +05:30
Ankush Menat
1d3842f03a fix: dont erase voucher_type and voucher_no for item_wh repost 
kept for tracability.
 2021-11-25 16:37:19 +05:30
Ankush Menat
a5a8c9104f perf: index for item-sh on repost item valuation 
Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.
 2021-11-25 16:37:19 +05:30
Ankush Menat
45dd46be3d feat: option to select reposting method 
In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.
 2021-11-25 16:37:19 +05:30
Ankush Menat
d220e08ba4 refactor: reuse get_items_to_be_repost function 2021-11-25 16:37:19 +05:30
Ankush Menat
a36c249d3d test: item-wh repost creation 2021-11-25 16:37:19 +05:30
Ankush Menat
6dc9b822bc refactor: item-wh wise reposting by default 2021-11-25 16:37:19 +05:30
Deepesh Garg
5ba3b28d69 fix(refactor): Advance tds allocation to purchase invoice 2021-11-25 15:42:30 +05:30
Marica
a369094eca
Merge pull request #28123 from marination/cost-of-poor-quality 
fix: Remove RM Cost column as cost is not retrievable from Job card
 2021-11-25 14:33:24 +05:30
Marica
ffdf32b5b3
Merge branch 'develop' into cost-of-poor-quality 2021-11-25 13:29:40 +05:30
marination
42395af22a fix: Remove commented code 2021-11-25 13:28:52 +05:30
marination
8c9779d69d fix: Dont auto set is finished item or is scrap itm checkbox for independent entry 
- System cant differentiate between scrap and FG when WO is absent, so dont auto set
- User must set it manually
- `validate_finished_goods` checks this
 2021-11-25 13:23:10 +05:30
marination
d6bc121999 fix: Validate Finished Goods for Independent Manufacture entries as well 
- Check if FG exists even if WO is absent
- Check if multiple FGs are there, block.
 2021-11-25 13:18:58 +05:30
GangaManoj
c9743185c6 fix: Remove unnecessary comma 2021-11-24 21:58:42 +05:30
GangaManoj
adfd519139 fix: Test Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 21:58:05 +05:30
GangaManoj
325923afc7 fix: Test that indices are reset for Packed/Bundle Items when Product Bundles are removed from the Items table 2021-11-24 21:47:06 +05:30
GangaManoj
8370042f82 fix: Reset indices in the Packed/Bundle Items table on deleting Product Bundles 2021-11-24 21:06:23 +05:30
Saqib Ansari
c46c8dd6c5 feat: do not change variance if response or resolution is set 2021-11-24 19:23:31 +05:30
Jannat Patel
5b2ba24563 fix: company tour 2021-11-24 19:19:45 +05:30
Mohammed Yusuf Shaikh
8d2abc4b86
fix: fixes in work order doctype (#28217) 
* fix: fixes in work order doctype

* fix: sider issues and disabled set only once property

* fix: set default qty to manufacture

* fix: dont manually collapse sections

* fix: remove unnecessary messages

* fix: make dependent fields read only

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-24 16:23:12 +05:30
Saqib Ansari
1f060c0b0a feat: find SLA based on customer group's ancestors 2021-11-24 14:00:18 +05:30
Saqib Ansari
9047e2b9dd refactor: do not set default priority in isssues 2021-11-24 13:52:20 +05:30
Saqib
136dd4f801
Merge branch 'develop' into product-bundle-fixes 2021-11-24 11:27:12 +05:30
Deepesh Garg
6ca5f228f8 Merge branch 'develop' of https://github.com/frappe/erpnext into advance_tds_allocation_gl 2021-11-24 10:45:02 +05:30
Ganga Manoj
6fd466a323
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-24 06:10:14 +05:30
GangaManoj
0803f87660 fix: Fix Product Bundle price calculation when there are multiple Product Bundles 2021-11-24 06:07:58 +05:30
Ganga Manoj
068177d293
Merge branch 'develop' into serialized-item-consumption 2021-11-24 05:29:56 +05:30
Ganga Manoj
5ef709f569
Merge branch 'develop' into depr-expense-account 2021-11-24 05:26:40 +05:30
GangaManoj
4311936b7d fix: Edit dates and frequency of depreciation 2021-11-24 05:21:31 +05:30
GangaManoj
6ec5a19063 fix: Test if clear_depreciation_schedule() works for multiple finance books 2021-11-24 03:23:02 +05:30
GangaManoj
33a0b1db2c fix: Retain depreciation schedule rows that are linked with JEs while clearing the schedule 2021-11-24 03:16:17 +05:30
GangaManoj
f455de2924 fix: Test if multiple Depreciation Schedules are set up for multiple Finance Books 2021-11-23 23:26:32 +05:30
GangaManoj
60d82d913c fix: Test Depreciation Entry posting when Depreciation Expense Account is an Income Account 2021-11-23 23:07:27 +05:30
GangaManoj
a36713cd2d fix: Test Depreciation Entry posting when Depreciation Expense Account is an Expense Account 2021-11-23 21:03:03 +05:30
GangaManoj
d406775d1a fix: Check root_type of Depreciation Expense Account 2021-11-23 20:21:24 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc (#28523) 2021-11-23 18:21:00 +05:30
mergify[bot]
34d1fec7de
fix: broken bom tree view and remove duplicate button (#28512) (#28527) 
* fix: broken bom tree view and remove duplicate button

(cherry picked from commit 7ae1369d64ecaa829965d89915475fbd3211b5c2)

Co-authored-by: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2021-11-23 17:53:26 +05:30
Ankush Menat
0df9cf9526
chore: remove dead/irrelevant links from workspace (#28519) 
* chore: remove dead link to shopify settings

* chore: unlink "debug" reports from stock dashboard
 2021-11-23 15:08:51 +05:30
Deepesh Garg
0931d17a2a
Merge branch 'develop' into currency-exchange-settings 2021-11-23 12:39:25 +05:30