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

6374 Commits

Author SHA1 Message Date
Ankush Menat
e75b72ae2d
Merge pull request #36856 from frappe/desk_user 
refactor!: Lower all perm to `Desk User`
 2023-08-29 20:55:55 +05:30
rohitwaghchaure
dea802dc41
fix: added valuation field type (Float/Currency) in the filter (#36866) 2023-08-29 16:53:00 +05:30
Gursheen Kaur Anand
26e8b8f959
fix: create entries for only PR items present in LCV (#36852) 
* fix: check if item code exists in lcv before creating gle

* refactor: use qb to fetch lcv items
 2023-08-29 09:03:31 +05:30
Ankush Menat
0d22fe02be refactor!: Lower all perm to Desk User 2023-08-28 22:42:14 +05:30
s-aga-r
49be1190d9
Merge pull request #36786 from s-aga-r/SCR-QI 
feat: `Quality Inspection` for Subcontracting Receipt
 2023-08-24 11:06:51 +05:30
Raffael Meyer
54ffe41b54
feat(MR): Project and Cost Center in Connections (#36794) 2023-08-24 10:12:18 +05:30
s-aga-r
3fdcd33b92 feat: Quality Inspection in Subcontracting Receipt 2023-08-23 12:15:35 +05:30
mergify[bot]
611c2bf775
fix: not able to make stock entry (backport #36759) (#36767) 
fix: not able to make stock entry (#36759)

(cherry picked from commit 873ee384a1f0832faf84015167f7bdc697f1dc46)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-22 17:36:56 +05:30
mergify[bot]
87d02511a3
fix: timeout error coming during reposting (backport #36715) (#36717) 
fix: timeout error coming during reposting (#36715)

(cherry picked from commit 620b21fec59e40178fde96085003d419804f21e0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-08-19 15:37:33 +05:30
rohitwaghchaure
3f6ff8e0b7
perf: enabled indexing for voucher no in SABB (#36688) 2023-08-17 13:48:37 +05:30
Deepesh Garg
98adfb4c9a
Merge pull request #36492 from RitvikSardana/develop-ritvik-POS-runtime-effect 
fix: POS runtime effect
 2023-08-17 10:54:48 +05:30
ruthra kumar
713880aef0
Merge pull request #36590 from ruthra-kumar/disallow_multiple_so_if_blocked_in_settings 
fix: disallow mulitple SO with same Purchase Order No if not enabled in Settings
 2023-08-11 19:46:24 +05:30
ruthra kumar
64614cd915 refactor(test): don't set po_no by default 2023-08-11 17:43:50 +05:30
s-aga-r
4a7fc1506f
fix: don't show disabled items in Item Shortage Report (#36550) 2023-08-10 09:40:58 +05:30
rohitwaghchaure
0b36e7d10e
fix: stock reconciliation negative stock error (#36544) 
fix: stock reco negative stock error
 2023-08-08 15:18:27 +05:30
s-aga-r
ecba6ee183
fix: enqueue submit/cancel action for stock entry having more than 50 line items (#36532) 2023-08-07 19:36:19 +05:30
rohitwaghchaure
28dfc88789
fix: stock entry decimal issue (#36530) 2023-08-07 17:31:38 +05:30
Ritvik Sardana
b483364649 Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-POS-runtime-effect 2023-08-05 11:26:47 +05:30
Ritvik Sardana
dbc000d655 fix: batched items method giving wrong quantity, so changed it back to previous way 2023-08-05 11:23:07 +05:30
mergify[bot]
b65ee6c2db
fix: cross connect delivery note and sales invoice (backport #36183) (#36457) 
fix: cross connect delivery note and sales invoice (#36183)

* fix: cross connect delivery note and sales invoice

* chore: remove unnecessary non_standard_fieldname

(cherry picked from commit 8501a1182ae8323d91438da30ddc8d93cf8c2789)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-08-05 10:57:23 +05:30
Ritvik Sardana
c9d5a62350 fix: POS Runtime Effect completed 2023-08-04 16:47:49 +05:30
ruthra kumar
a93ae9c826
Merge pull request #36434 from ruthra-kumar/replace_get_cached_with_get_single_value 
fix: incorrect usage `get_cached_value` on single doctypes
 2023-08-01 10:02:33 +05:30
ruthra kumar
ba15810639 fix: incorrect usage get_cached_value on single doctypes 2023-08-01 07:58:09 +05:30
Ankush Menat
f31d07554d
perf: avoid full table scan in sle count check (#36428) 2023-07-31 22:13:47 +05:30
Devin Slauenwhite
e8eeeb16e2
fix: group item reorder by (warehouse, material_request_type) (#35818) 
* fix: group item reorder by (warehouse, material_request_type)

* fix: update reorder error message

* chore: linter

* fix: correct error message

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-07-31 12:47:14 +00:00
Ankush Menat
c0642cf528
fix: only publish repost progress to doc subscriber (#36400) 
Huge size of string gets blasted to everyone on site. Due to some memory
leak (cause unknown) till sockets are open the strings are also in
process' memory.

related https://github.com/frappe/frappe/issues/21863
 2023-07-29 09:32:11 +00:00
rohitwaghchaure
ee7da639e7
Merge pull request #36380 from rohitwaghchaure/fixed-fieldtype-from-currency-to-flt 
fix: change fieldtype from Currency to Float for the valuation rate in reports
 2023-07-28 20:35:46 +05:30
Rohit Waghchaure
c82cb379a5 fix: change fieldtype from Currency to Float for the valuation rate in the stock report 2023-07-28 17:21:05 +05:30
rohitwaghchaure
dac9fd64a8
Merge pull request #36328 from rohitwaghchaure/fixed-purchase-receipt-timeout-on-cancel-develop 
fix: timeout error while cancelling the Purchase Receipt
 2023-07-27 23:26:59 +05:30
Deepesh Garg
829387c2bc
Merge pull request #36360 from deepeshgarg007/fy_default_dates 
fix: Default year start and end dates in reports
 2023-07-27 22:35:35 +05:30
Deepesh Garg
ebdf1959fd
Merge pull request #36254 from deepeshgarg007/remove_auto_repeat 
fix: Remove auto repeat (subscription) button from Sales and Purchase documents
 2023-07-27 21:18:03 +05:30
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
Rohit Waghchaure
1c2da92233 fix: timeout error while cancelling the Purchase Receipt 2023-07-26 13:03:23 +05:30
Rohit Waghchaure
55a9537220 fix: added missing option Partially Received in the status dropdown field 
(cherry picked from commit 4fa93b05c62b7f340a94e9e84d9d2e132ea35b99)
 2023-07-25 12:39: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
rohitwaghchaure
7f4dda1b06
Merge pull request #36259 from rohitwaghchaure/fixed-report-default-email-outgoing-error 
fix: no default email account causing reposting issue
 2023-07-24 15:03:09 +05:30
Rohit Waghchaure
efb51526a9 fix: no default email account causing reposting issue 2023-07-24 14:00:20 +05:30
Deepesh Garg
4bb6db86f8 fix: Remove auto repeat (subscription) button from Sales and Purchase documents 2023-07-24 12:29:57 +05:30
Deepesh Garg
3c92686f0a fix: Default year start and end dates in reports 2023-07-24 11:58:16 +05:30
Deepesh Garg
8d3d9493f0 chore: linting issues 2023-07-23 20:06:41 +05:30
Deepesh Garg
8ccb8e3c5b chore: Move buying controller to utils 2023-07-23 18:50:44 +05:30
Deepesh Garg
7205fb9b97 chore: convert sales common to utils 2023-07-23 12:07:21 +05:30
Deepesh Garg
4077254b01 chore: resolve undefined variables issue 2023-07-22 23:07:18 +05:30
Deepesh Garg
0b1e78e127 chore: Add landed cost taxes and charges common in bundles 2023-07-22 21:19:48 +05:30
rohitwaghchaure
1084f0d97f
Merge pull request #36209 from mohsinalimat/patch-2 
fix: Ambiguous column error while submitting stock entry
 2023-07-20 18:03:27 +05:30
rohitwaghchaure
9a9939cfb3
Merge pull request #36208 from rohitwaghchaure/fixed-filter-mandatory-for-batch-wise-balance-report 
fix: made item or warehouse filter mandatory
 2023-07-20 18:02:37 +05:30