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

2759 Commits

Author SHA1 Message Date
Gursheen Anand
341f9030f5 fix: use frm instead of cur_frm 
(cherry picked from commit ceeb8fc9e537a42aaae1dd3b337fa8250b04a74f)
 2024-02-27 07:45:36 +00:00
Gursheen Anand
6b5e1cfeb7 fix: type error for missing frm obj 
(cherry picked from commit 20fa3da950f3834cac812c9702284c470fb19af2)
 2024-02-27 07:45:36 +00:00
ruthra kumar
5c269a9947 refactor: update payments section on item removal 
(cherry picked from commit 406793a6ff2f4e9aef9fc30d20fa2c3b81ca2f50)
 2024-02-25 03:58:19 +00:00
mergify[bot]
53d943ec70
fix: Cannot read properties of undefined (backport #40081) (#40083) 
fix: Cannot read properties of undefined

(cherry picked from commit 44ed52c5cfa6a2432769bbb6f3c352aa81025de2)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-02-24 17:04:36 +05:30
Rohit Waghchaure
824df72eeb fix: change label name 
(cherry picked from commit 635174f1cee1e421bfb7c724acc2219f928af2ef)
 2024-02-24 07:40:56 +00:00
Gursheen Anand
32d9642379 fix: check for pricing rules on item 
(cherry picked from commit ecd83b12abb19e0e41a50e914a89b320e1f577eb)
 2024-02-22 03:37:17 +00:00
mergify[bot]
2ee51d36ff
fix: set batch created from bundle to batch field in stock transaction (backport #39966) (#39987) 
fix: set batch created from bundle to batch field in stock transaction (#39966)

* fix: set batch created from bundle to batch field in stock transaction

* fix: validation for serial and batch no

(cherry picked from commit 4b24fcd2216caadbec402fc7d1e412bdcc662dad)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-21 00:04:01 +05:30
mergify[bot]
acd2e93f8c
fix: do not empty serial batch fields (backport #39948) (#39956) 
fix: do not empty serial batch fields (#39948)

(cherry picked from commit a4cbfabe0ee4c8fca3ac654e6b3fe3db8b551334)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-02-19 10:45:28 +05:30
Rohit Waghchaure
40d4e3261e fix: use serial batch fields not enabled for new stock entry 
(cherry picked from commit dc9115a5865c86721863cfbda55bb00ac00cb756)
 2024-02-16 10:20:35 +00:00
Rohit Waghchaure
a08b97e886 test: fixed test cases 
(cherry picked from commit c1e869f040fd4c6ec2e234db71c3f80be50e4524)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
282c19e7e1 fix: use old serial / batch fields to make serial batch bundle 
(cherry picked from commit 9fafc83632c4e5c73186bda038b892b7a43d16b8)
 2024-02-06 10:18:05 +00:00
Rohit Waghchaure
3bef12cb55 feat: make material request for job card from workstation dashboard 
(cherry picked from commit 6fea9d6dfe50513614e39a7b83ad4db59970e26e)
 2024-02-05 13:50:45 +00:00
Rohit Waghchaure
75bd1e6b65 feat: visual plant floor 
(cherry picked from commit 68c997aa067f342f6e432e9f9c84416a0a4cc1bf)
 2024-02-05 13:50:44 +00:00
mergify[bot]
d7c7748c03
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448) 
fix: fetch/change tax template on basis of base_net_rate instead of net_rate (#39448)

fix: change tax template on basis of base_net_rate instead of net_rate

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit e9fe10c6f13424630a2bfc7cfef1e1faeebab30d)

Co-authored-by: Divyam Mistry <73271406+divyam-mistry@users.noreply.github.com>
 2024-02-03 09:09:59 +05:30
mergify[bot]
f31070741a
fix: Pricing rule application/removal on qty change (#39084) 
fix: Pricing rule application/removal on qty change

(cherry picked from commit f52d7c7665d4097b19a8bb6c5f99acf38cd8adcf)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-02-03 08:49:50 +05:30
barredterra
ba55d0ede7 chore: resolve conflicts 2024-01-31 13:19:19 +01:00
barredterra
dcdd3e8cc4 fix: don't overwrite existing terms in transaction 
(cherry picked from commit 77b044f1a6e7273b21ce5a884429875b10d3bb2e)

# Conflicts:
#	erpnext/public/js/controllers/transaction.js
 2024-01-31 00:14:44 +00:00
Gursheen Anand
0aa73e31ce fix: check page obj before adding menu 
(cherry picked from commit 2486b646a1e28a61c02db911b6b538c3f63cc915)
 2024-01-29 06:07:13 +00:00
mergify[bot]
a118417645
refactor: provision to filter on dimensions in reconciliation tool (#39054) 
* refactor: dimensions section in allocation table in reconciliation

(cherry picked from commit 1cde804c773de41520a6148e7d99ab0c23c39ae1)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: update dimension doctypes in hooks

(cherry picked from commit cfb3d872673844f04f5c9dd3f7d7f56288e5dd22)

* refactor: dimensions filter section in payment reconciliation

(cherry picked from commit 20e0acc20a218029d7101a1ba6ff3c1ae03fac02)

* refactor: column break in dimension section

(cherry picked from commit 20576e0f47ba3c4937121bfab1e0d8d395a590ce)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json

* refactor: handle dimension filters

(cherry picked from commit c1fe4bcc64775507a3bd8e02b61274d8dc2d6447)

* refactor: pass dimension filters to query

(cherry picked from commit ff60ec85b85d5548886e247b72cf1262587feba3)

* refactor: set query filters for dimensions

(cherry picked from commit ad8475cb8b24d40b04f86903feee08ecac6aa1f1)

* refactor: pass dimension details to query

(cherry picked from commit 5dc22e1811bb1841bb8c790cc3a1e1315cef6074)

* refactor: replace sql with query builder for Jourals query

(cherry picked from commit 9c5a79209eb014c90aac46a5dd5ed0d9b7cb8f87)

* refactor: partial change on outstanding invoice popup

(cherry picked from commit 2154502955166243e354897d7dcb22d1987c4693)

* fix: typo's and parameter changes

(cherry picked from commit 0ec17590ae062fbda0c14a2806ec1ac07c638593)

* refactor: Credit Note and its Exc gain/loss JE inherits dimensions

(cherry picked from commit ab939cc6e8ab3669f1e9b0f007e9459be180ac32)

* refactor: apply dimension filters on cr/dr notes

(cherry picked from commit 188ff8cde794bb1ef1043f0e47469d65944aac1e)

* chore: test dimension filter output

(cherry picked from commit e3c44231abbbe389a1f815ab77f2d6ff0c614e1b)

* test: dimension inheritance for cr note reconciliation

(cherry picked from commit ba5a7c8cd8ee6fc09b0d81ffbe8b364e584f1f1b)

* refactor: pass dimension values to Gain/Loss journal

(cherry picked from commit c44eb432a59fb3ffb3748e47356068499f1129b1)

# Conflicts:
#	erpnext/accounts/utils.py

* test: dimension inheritance in PE reconciliation

(cherry picked from commit 6148fb024b7157d637aa2308e7c856969858468d)

* refactor: pass dimensions on advance allocation

(cherry picked from commit cbd443a78afbc7c58055881e534a8aa56ca4bea6)

* test: dimension inheritance on adv allocation

(cherry picked from commit fcf4687c523202436234814af3da4c4d84f5eba9)

* refactor: dynamic dimension filters in pop up

(cherry picked from commit f8bbb0619cbbbaace8f54a9f8758c3962ebe4725)

* refactor: update dimensions, only if provided

(cherry picked from commit ec0f17ca8bd810e41ae73f5a45f304ba38c63d0a)

* refactor: handle dynamic dimension in order query

(cherry picked from commit 7c2cb70387d7dbb7f976d28919ce21f25a0b6acd)

* chore: resolve conflicts

---------

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
 2024-01-28 13:50:08 +05:30
mergify[bot]
a83f3106f3
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588) 
feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)
 2024-01-28 13:48:55 +05:30
mergify[bot]
7def475eb1
fix: incorrect active serial nos (backport #39389) (#39589) 
fix: incorrect active serial nos

(cherry picked from commit 64cb1153de2d09883234e4e80e5306de27db328f)

Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
 2024-01-27 11:57:58 +05:30
Gursheen Anand
a7d13686c7 fix: type error on company doc 
(cherry picked from commit 030d35628dcd7bd919a9f4e62173206a115f6ea2)
 2024-01-26 17:31:07 +00:00
Rohit Waghchaure
ca93f671df fix: auto create serial no on scan 
(cherry picked from commit fc0d2aeeffed9a2f87be0d87f0a0af0e837c5955)
 2024-01-23 06:27:59 +00:00
Rohit Waghchaure
c76145985d fix: UX improvements for Serial and Batch Bundle 
(cherry picked from commit 5d94f0bde55329411c419c242749e0260d3bb7c9)
 2024-01-23 06:27:59 +00:00
ruthra kumar
0acbbefa8b refactor: move 'project' set_query to sales_common.js 
(cherry picked from commit 52814724eb3e7d0a350ddeb01214ba3855a1ccc9)
 2024-01-22 10:21:28 +00:00
ruthra kumar
80956b7956 fix: possible typerror in utils.js 
and remove unwanted debugging statements

(cherry picked from commit 60b26ad8b262752e7d491b3fe21b398c0928bfaf)
 2024-01-15 15:16:51 +00:00
ruthra kumar
a51f956f3e fix: project filters on Delivery Note and Sales Order 
(cherry picked from commit 9ba6ff67d5727ee97f12a9cbee120e78c20d6cec)
 2024-01-11 12:34:43 +00:00
ruthra kumar
fec892c211 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b6239bb01fb8304056776f1fae24694)
 2024-01-10 06:24:46 +00:00
mergify[bot]
2db1e1a737
fix: serial / batch barcode scanner (backport #39114) (#39143) 
fix: serial / batch barcode scanner (#39114)

(cherry picked from commit f09e2130a1a3ca999247f89f76c20efcc003b450)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-04 16:02:29 +05:30
ruthra kumar
54a0df5164 fix: typerror on multi select dialog 
(cherry picked from commit 7da9ffa3bd072fbfc9627e6eb5afb3dd3078f560)
 2024-01-03 15:25:24 +00:00
mergify[bot]
2e919344df
fix: auto fetch not working if bundle exists (backport #39002) (#39004) 
fix: auto fetch not working if bundle exists (#39002)

(cherry picked from commit b5340c5ec0d418dcf764efa961f743f88b660a24)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-28 18:54:38 +05:30
mergify[bot]
f8625f3eb7
fix: not able to cancel sales invoice (backport #38979) (#38980) 
fix: not able to cancel sales invoice (#38979)

(cherry picked from commit a117ef3cb88223f0a9f94f863e232b2771b277c8)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-28 11:21:51 +05:30
mergify[bot]
4e2304818b
feat: Merge taxes from mapped docs (#38346) 
feat: Merge taxes from mapped docs (#38346)

* feat: Merge taxes from mapped docs

* chore: ci failures

(cherry picked from commit 9b1c22250f1da37a563ba0885fbbd732b176816c)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-12-28 08:28:02 +05:30
mergify[bot]
5874be0f79
fix: incorrect qty in serial batch bundle against pick list (backport #38964) (#38966) 
fix: incorrect qty in serial batch bundle against pick list (#38964)

(cherry picked from commit 47ee801d373058a2739c2fd42d971d624c42d5a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-27 14:06:55 +05:30
mergify[bot]
82960e3312
fix: reset the incoming rate on changing of the warehouse (backport #38925) (#38926) 
fix: reset the incoming rate on changing of the warehouse (#38925)

(cherry picked from commit 161ae1edd1ebcafd14d7a302ad1adde238e43426)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-22 17:55:58 +05:30
Deepesh Garg
b52ceceeb7
Merge pull request #38808 from vorasmit/fetch-item-taxes-v15 
fix: fetch item_tax_template values if fields with fetch_from exisit (#38284)
 2023-12-17 18:51:05 +05:30
mergify[bot]
8990c48e7b
fix: serial and batch bundle return not working (backport #38754) (#38806) 
fix: serial and batch bundle return not working (#38754)

* fix: serial and batch bundle return not working

* test: added test case for delivery note return against denormalized serial no

(cherry picked from commit 0743289925d0866a16373c05cfb81825b58e35ba)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-17 18:02:31 +05:30
Smit Vora
fba28d6941 fix: fetch item_tax_template values if fields with fetch_from exisit 2023-12-17 13:59:22 +05:30
mergify[bot]
a551660d2a
fix: timezone aware SLA banner (backport #38745) (#38747) 
fix: timezone aware SLA banner (#38745)

(cherry picked from commit eaf86a6461438720fe941100d6feccefbfa3bfed)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-14 15:59:21 +05:30
mergify[bot]
3fabca1051
Revert "fix(ux): don't update qty blindly" (backport #38728) (#38730) 
Revert "fix(ux): don't update qty blindly" (#38728)

(cherry picked from commit 6851c5042fc5e2d3f45d070af18a33c24fc10794)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-13 23:16:15 +05:30
mergify[bot]
1dcb065c64
fix: barcode scanning for the stock entry (backport #38716) (#38718) 
fix: barcode scanning for the stock entry (#38716)

(cherry picked from commit 13cba5068bd1d09bff4204a64a74999876566b6b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 18:32:48 +05:30
mergify[bot]
6e2cde4a21
fix: show stock qty in popup (backport #38698) (#38699) 
fix: show stock qty in popup (#38698)

(cherry picked from commit b562b4cf99e68108a0d7ba3a90e60ef3d7d01b0f)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 17:04:57 +05:30
ruthra kumar
9239e735ad fix: typeerror on new sites (#38692) 
(cherry picked from commit fa2d33cb50753449cc8f4218c94d07ed99f2af03)
 2023-12-12 10:14:39 +00:00
mergify[bot]
4150ed9b3b
fix: Shipping Address Link Showing in Buying (backport #38634) (#38646) 
fix(ux): `Shipping Address Link`

(cherry picked from commit ca0c3eb184b02f56f36879f9472ce82b55dcee1d)

Co-authored-by: creative-paramu <pparameshwari@thirvusoft.in>
 2023-12-08 19:04:24 +05:30
mergify[bot]
0b2e2a2ab5
fix(ux): don't update qty blindly (backport #38608) (#38639) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f3433f1a3ddb08885d2b85902c1114345)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:32 +05:30
Shariq Ansari
d79e6e353e fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd31394eb1108dc29a7a5b3f6ded85e3656)
 2023-12-07 15:18:52 +00:00
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534) (#38552) 
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-04 15:24:28 +05:30
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209) 
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2023-12-04 09:36:52 +05:30
Gursheen Anand
0e50e77d8e fix: unset discount amount based on coupon code 
(cherry picked from commit 6518582ed3be49dd3bc6a62745dae3e6faed2658)
 2023-11-29 10:25:19 +00:00
Patrick Eissler
95f9cc99b9 fix: make create button translatable (#38165) 
* fix: make all create buttons translatable

* style: use double quotes

---------

Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8e4b591ea2ad420a7c861a06414d3bee6e6ee042)
 2023-11-29 04:54:25 +00:00