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

1833 Commits

Author SHA1 Message Date
Vimal
ce36d1f668
fix: job card suggest holiday as start date (#35958) 2023-07-31 17:51:31 +05:30
rohitwaghchaure
b71dafd1f1
Merge pull request #36375 from ramonus/job-card-fix 
fix: Job Card validation fixed when displaying total completed quantity
 2023-07-29 15:01:16 +05:30
s-aga-r
d9ac7f9b87
Merge pull request #36221 from s-aga-r/FIX-ISS-23-24-02079 
perf: use `LEFT JOIN` instead of `NOT EXISTS`
 2023-07-28 17:51:24 +05:30
rohitwaghchaure
4e58503075
Merge pull request #36377 from rohitwaghchaure/fixed-pp-sub-assembly-available-items 
fix: multiple issues related to Production Plan
 2023-07-28 17:26:06 +05:30
s-aga-r
148d466ae5 fix: long queue process_boms_cost_level_wise 2023-07-28 17:05:17 +05:30
s-aga-r
58d867503b perf: use LEFT JOIN instead of NOT EXISTS 2023-07-28 16:44:41 +05:30
Rohit Waghchaure
1c2148b637 fix: multiple issues related to Production Plan 2023-07-28 15:38:00 +05:30
ramonalmato
49981fecc7 fix: Job Card validation fixed when displaying total completed quantity 2023-07-28 10:57:31 +02:00
Deepesh Garg
2341061852 fix: Default year start and end date in reports 2023-07-27 21:03:32 +05:30
Deepesh Garg
4496a6760e fix: Default year start and end dates in reports 2023-07-27 20:54:55 +05:30
Deepesh Garg
cf50bb45ad
Revert "fix: Default year start and end dates in reports" 2023-07-27 19:13:11 +05:30
Deepesh Garg
5dc8195d91
Merge pull request #36249 from deepeshgarg007/default_dates 
fix: Default year start and end dates in reports
 2023-07-27 12:19:44 +05:30
Ankush Menat
1d7dbd3456
perf: don't use ifnull where it's not required (#36336) 
ifnull isn't really required when doing `!= 'anything'` because if it's null then value will be falsy.
ifnull is only required when checking `= ''` if you treat `null = ''`

Actuall better fix would be make things explcitly non-nullable, then we won't ever have to add this on such fields.

ref: https://github.com/frappe/frappe/pull/21822
 2023-07-27 06:06:07 +00:00
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint 
refactor(ci): add eslint and update linting confs
 2023-07-24 20:55:07 +05:30
Deepesh Garg
3c92686f0a fix: Default year start and end dates in reports 2023-07-24 11:58:16 +05:30
Deepesh Garg
0d70ae2a21 chore: Ingnore issues 2023-07-23 19:34:08 +05:30
Rohit Waghchaure
7af3c3d0b6 fix: incorrect Reserved Qty for Production Plan in BIN for multi-uom case 
(cherry picked from commit 2f632d031aa53e1e03763623449e7cde7dca3c55)
 2023-07-17 15:11:13 +00:00
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults (#35960) 
* fix: Remove current fiscal year from Global Defaults

* fix: Remove button to set default

* fix: Add utils to get fiscal year

* fix: Incorrect import

* feat: Add hook for naming series parser
 2023-07-16 12:58:42 +05:30
Deepesh Garg
f0d4c4c180 Merge branch 'develop' of https://github.com/frappe/erpnext into eslint 2023-07-15 20:29:14 +05:30
Deepesh Garg
3fa2a8c2d8 chore: fix linting issues 2023-07-15 18:03:16 +05:30
Deepesh Garg
924cdef6d9 ci: add eslint and update linting confs 2023-07-14 18:53:02 +05:30
s-aga-r
8f5b94f5fd
fix: TypeError while creating WO from PP (#36136) 2023-07-14 18:01:11 +05:30
Deepesh Garg
0a6c565eb3
fix: Ambiguous column error while submitting stock entry 
fix: Ambiguous column error while submitting stock entry
 2023-07-12 10:18:38 +05:30
s-aga-r
be5881280f
fix: incorrect status in MR created from PP (#36085) 2023-07-11 17:09:23 +05:30
MohsinAli
2816076789
1052, "Column 'qty' in field list is ambiguous in work_order.py 2023-07-10 14:09:41 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links (#35995) 
Frappe School provides plenty of free tutorial for learning ERPNext.
 2023-07-04 14:58:45 +05:30
rohitwaghchaure
9f1cf0bbb0
Merge pull request #35921 from rohitwaghchaure/fixed-seperate-table-for-schedule 
refactor: separate table added to track scheduling in the job card.
 2023-06-29 22:24:47 +05:30
Rohit Waghchaure
497c83eb7e refactor: separate table added to track scheduling in the job card 2023-06-29 20:51:44 +05:30
Devin Slauenwhite
802c89ffb3
feat: allow Sales Invoice as data source (#35855) 
* feat: allow Sales Invoice as data source

* chore: linter
 2023-06-24 12:31:16 +05:30
rohitwaghchaure
f4f8df6cfe
Merge pull request #35842 from rohitwaghchaure/fixed-multiple-work-orders-against-sigle-production-order 
fix: multiple Work Orders against same production plan
 2023-06-22 22:11:09 +05:30
Rohit Waghchaure
80fffbd64b fix: multiple Work Orders agaist same production plan 2023-06-22 15:57:28 +05:30
Sagar Sharma
b5c1c725be
Merge pull request #35739 from s-aga-r/FIX-35493 
fix(ux): set route options for new `SBB`
 2023-06-18 15:13:15 +05:30
mergify[bot]
e3afcc6945
fix: cannot start / stop Job Card (backport #35753) (#35755) 
fix: cannot start / stop jobs

(cherry picked from commit 53ec2a9268ca41fd44f58859df02c1f0876ed757)

Co-authored-by: Anoop Kurungadam <anoop@earthianslive.com>
 2023-06-17 12:15:47 +05:30
s-aga-r
4b5454c752 fix(ux): set route options for new SBB 2023-06-16 15:04:37 +05:30
s-aga-r
d176d86e2c fix: Process Loss Report 2023-06-15 16:01:08 +05:30
rohitwaghchaure
4820221a41
Merge pull request #35636 from s-aga-r/FIX-SBB-AttributeError 
fix: miscellaneous
 2023-06-14 16:02:04 +05:30
s-aga-r
7549a5c371 fix(ux): add filters for SBB 2023-06-14 15:04:51 +05:30
Ankush Menat
a3ea985348
refactor: Use db.set_single_value (#35668) 
I just applied semgrep autofix. Untested completed, review before merging.

```yaml
- id: frappe-set-value-semantics
  patterns:
    - pattern-either:
      - pattern: frappe.db.set_value($DOCTYPE, None, $...AFTER)
      - pattern: frappe.db.set_value($DOCTYPE, $DOCTYPE, $...AFTER)
  fix: frappe.db.set_single_value($DOCTYPE, $...AFTER)
  message: |
    If $DOCTYPE is a single doctype then using `frappe.db.set_value` is discouraged for setting values in DB. Use db.set_single_value for single doctype instead.
  languages: [python]
  severity: ERROR
```
 2023-06-13 17:30:38 +05:30
rohitwaghchaure
93fe923e2a
Merge branch 'develop' into fixed-process-loss-in-job-card 2023-06-12 19:04:19 +05:30
Rohit Waghchaure
0382eecff4 fix: test case 2023-06-12 18:20:38 +05:30
Rohit Waghchaure
e9a6191af9 fix: added process loss in job card 2023-06-09 20:33:46 +05:30
Ankush Menat
4507cb3cd7
fix: enqueue_after_commit wherever it makes sense (#35588) 2023-06-07 11:58:36 +05:30
Rohit Waghchaure
f4cfc589c6 fix: serial and batch selector 2023-06-02 17:14:18 +05:30
Rohit Waghchaure
f8bf4aa7c8 fix: travis for work order, pos invoice and landed cost voucher 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
d3ceb07936 fix: travis 2023-06-02 17:14:17 +05:30
Rohit Waghchaure
16f26fb3d8 refactor: serial and batch package creation for finished item and cleanup code 2023-06-02 17:14:15 +05:30
Rohit Waghchaure
e6143abb8a refactor: added new file serial batch bundle 2023-06-02 17:14:14 +05:30
Rohit Waghchaure
6c9b212dd1 fix: removed sales and purchase fields from serial nos 2023-06-02 17:14:14 +05:30
rohitwaghchaure
cb19ebcd85
Merge pull request #35482 from rohitwaghchaure/fixed-stock-entry-missing-bom-details 
fix: missing bom details in the stock entry
 2023-05-31 17:29:19 +05:30
Ankush Menat
4bdd276f74
Merge pull request #35409 from nabinhait/workspace-cleanup 
refactor: Workspace cleanup
 2023-05-31 16:40:26 +05:30