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

1262 Commits

Author SHA1 Message Date
Rohit Waghchaure
0d190bb930 fix: multi-currency issue 2021-07-13 15:32:39 +05:30
rohitwaghchaure
f130f8385e
Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working 
fix: bom stock report not working
 2021-07-07 00:22:03 +05:30
Rohit Waghchaure
5638fbb1aa fix: bom stock report not working 2021-07-05 13:54:05 +05:30
Richard Case
75fdf79376
fix: incorrect bom no. added for non-variant items on variant boms (#26320) 2021-07-05 10:56:34 +05:30
Rohit Waghchaure
3105332e3c fix: allow to make job card without employee 2021-07-03 17:25:08 +05:30
rohitwaghchaure
c14fc9530c
Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom 
fix: update cost not working in the draft BOM
 2021-07-01 11:57:32 +05:30
Rohit Waghchaure
0bfd56e615 fix: update cost not working in the draft bom 2021-07-01 11:50:48 +05:30
Rohit Waghchaure
815e6ec846 fix: minor removed unused file 2021-06-30 11:35:50 +05:30
rohitwaghchaure
2a1d1e1cb1
Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement 
feat: provision to make subcontracted purchase order from the production plan
 2021-06-30 11:15:11 +05:30
Rohit Waghchaure
61690775a8 feat: provision to make subcontracted purchase order from the production plan 2021-06-29 19:59:20 +05:30
Rohit Waghchaure
2d1c4fee1d fix: allow to changes to date in the blanket order 2021-06-29 00:33:55 +05:30
Rohit Waghchaure
e5c47f8957 fix: fetch batch items in stock reco 2021-06-26 17:40:27 +05:30
Ankush Menat
9e43445f36
fix: order and time of operations for multilevel bom 
- Order of operations was being sorted by idx of individual operations in
BOM table, which made the ordering useless.
- This adds ordering that's sorted from lowest level item to top level
item.
- chore: remove dead functionality. There's no `items` table. Required
  item level operations get overwritten on fetching of items /
  operations e.g. when clicking on multi-level BOM checkbox.
- test: add test for tree representation
- feat: BOMTree class to get complete representation of a tree
 2021-06-25 14:44:55 +05:30
Ankush Menat
6ec8875434
fix(ux): show bom in operations child table 2021-06-25 14:44:53 +05:30
Ankush Menat
ff4aadc657
chore: remove dead and py2 compatibility code 
form_grid_template doesn't exist
 2021-06-25 14:43:49 +05:30
Rohit Waghchaure
2330c41cca fix: total time calculation 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
57307443f0 is corrective job card 2021-06-24 18:14:19 +05:30
Rohit Waghchaure
c878389050 fix: or condition filter in the get_all 2021-06-24 18:14:18 +05:30
Rohit Waghchaure
fcab53b238 fix: skip job card 2021-06-24 18:07:31 +05:30
Rohit Waghchaure
6e81489095 feat: Job Card Enhancements 2021-06-24 18:07:30 +05:30
Noah Jacob
da82bd4b51
refactor: update cost updates operation time and hour rates in BOM (#25891) 
* refactor: updates hour_rate and operation time on update cost

* refactor: hour_rates are updated in routing when updated in workstations

* test: test cases for updating hour_rates and operation time in linked bom
 2021-06-24 17:23:21 +05:30
Ankush
98e98d25e6
fix(Work Order): added freeze when trying to stop work order (#26192) (#26196) 
* fix: added freeze when trying to stop work order

* fix(ux): add freeze message

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-24 14:24:28 +05:30
rohitwaghchaure
8347eb1dba
Update production_plan.js 2021-06-21 15:38:44 +05:30
Rohit Waghchaure
773aabae44 fix: allow to select group warehouse while downloading materials from production plan 2021-06-21 14:54:27 +05:30
Rohit Waghchaure
a94b89727c feat: subcontract code refactor and enhancement 2021-06-19 23:16:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Rohit Waghchaure
af4794b2d1 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-04 10:53:44 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat 
feat: Added check box to combine items with same BOM
 2021-06-03 12:37:02 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list (#25874) 
Item query doesn't support list filter anymore.
 2021-05-28 21:12:25 +05:30
noahjacob
73e41c0bd6 refactor: suggested changes 2021-05-25 18:01:47 +05:30
noahjacob
bf1b3b89d1 refactor: updated conditional visibility of check box 2021-05-24 17:03:15 +05:30
noahjacob
516c789127 refactor: variable names and suggested changes 2021-05-19 16:01:39 +05:30
noahjacob
50f52dfbcb refactor: variable names and refactored cancel function into submit function 2021-05-09 20:04:06 +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
Noah Jacob
4ecae62194
fix: added is_stock_item filter (#25530) 2021-05-06 19:42:01 +05:30
noahjacob
90c667205a test: added on_cancel test 2021-04-29 13:06:04 +05:30
noahjacob
93c22ebbb9 refactor: created separate function to update work_order on cancel 2021-04-29 12:57:41 +05:30
noahjacob
56f697052c test: added test case for combining items 2021-04-28 20:12:33 +05:30
noahjacob
b7ca913904 fix: Added Item Reference field to link tables and update work_order_qty 2021-04-28 19:27:20 +05:30
noahjacob
82905166d9 fix: Fixed updating sales order work qty after cancelling work order 2021-04-28 10:14:36 +05:30
noahjacob
1e912db3bb feat: Added check box to combine items 2021-04-26 16:01:17 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults (#25370) 2021-04-19 10:33:39 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Rushabh Mehta
65f25c27b3 fix(minor): fix dynamically changing grid properties 2021-04-13 11:58:16 +05:30
Ankush Menat
c65751d97f
test: ignore floating point errors in test_bom 2021-04-12 19:45:34 +05:30
rohitwaghchaure
f9fde054e1
Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost 
fix: bom cost test case
 2021-04-08 14:39:08 +05:30
Rohit Waghchaure
fa8bb87a86 fix: bom cost test case 2021-04-08 13:38:22 +05:30
Ankush Menat
cb625d868c
fix: round total quantity in job card 2021-04-08 12:05:52 +05:30