Ankush Menat
75983ce809
fix: remove global _("translation") calls ( #32828 )
...
This is not how it works. Translations are dynamic based on language
sets during request (using header, user's preferences etc)
Calling them on global variables makes no sense.
Ref: https://github.com/frappe/frappe/pull/18733
2022-11-05 18:49:15 +05:30
Sagar Sharma
e820629f83
Merge pull request #32850 from s-aga-r/fix/scr/return
...
fix: wrong consumed items in SCR return
2022-11-05 17:23:04 +05:30
Sagar Sharma
cc8d540943
Merge branch 'develop' into fix/scr/return
2022-11-05 16:48:59 +05:30
Deepesh Garg
90fbab4b1e
Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter
...
fix: Create POS Opening Entry POS Profile filter.
2022-11-05 16:44:39 +05:30
Sagar Sharma
5665d1afa0
Merge branch 'develop' into fix/scr/return
2022-11-05 16:36:07 +05:30
Deepesh Garg
be0f6b3e6e
Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice
2022-11-05 16:35:55 +05:30
Deepesh Garg
0966867c08
chore: Reset repost_required_flag on cancel
2022-11-05 16:35:43 +05:30
Deepesh Garg
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances
...
fix: Auto advance allocation against partial invoices
2022-11-05 16:27:59 +05:30
Sagar Sharma
b5221a5c74
Merge branch 'develop' into fix/scr/return
2022-11-05 16:23:58 +05:30
Sagar Sharma
324bfa9fde
test: fix test case
2022-11-05 16:18:31 +05:30
Sagar Sharma
760c26e9c0
fix: make BOM required in SCR Item
2022-11-05 15:52:14 +05:30
Sagar Sharma
761e9df1bf
test: add test case
2022-11-05 15:52:14 +05:30
Sagar Sharma
611d827e0b
fix: rename test method
2022-11-05 15:51:29 +05:30
Sagar Sharma
54072ec9cd
fix: map BOM while mapping the return SCR
2022-11-05 15:51:29 +05:30
Sagar Sharma
4a4abf9b64
Merge pull request #32849 from frappe/mergify/bp/develop/pr-32831
...
fix: mysql syntax issue (backport #32831 )
2022-11-05 12:40:34 +05:30
Sagar Sharma
3ca9d53d1b
refactor: rewrite query in QB
...
(cherry picked from commit 2f145f99129503359b9a79c247fe69e30ac1bf8e)
2022-11-05 06:12:40 +00:00
Bhavesh Maheshwari
f4779df9b3
fix: mysql syntax issue
...
(cherry picked from commit 4d9bbd4c9c06811086e0ae4e2c16763fe7d171a3)
2022-11-05 06:12:40 +00:00
Deepesh Garg
428971f127
test: Check parital payment allocation
2022-11-04 15:50:39 +05:30
Deepesh Garg
181df2fe63
fix: Auto advance allocation against partial invoices
2022-11-04 15:49:37 +05:30
Maharshi Patel
1328a45f2a
fix: Create POS Opening Entry POS Profile filter.
...
pos_profile_query was variable instead of function.
2022-11-04 15:29:17 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice
...
feat: Item Wise TDS Calculation
2022-11-04 13:08:10 +05:30
Deepesh Garg
159b511d16
Merge pull request #32809 from monolithon/develop
...
feat: Optional Hungarian COA for microenterprises
2022-11-04 13:00:13 +05:30
rohitwaghchaure
441f082fcb
Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality
...
fix: Scan Barcode UX
2022-11-04 11:04:40 +05:30
Deepesh Garg
f6a61b999f
chore: fix patch
2022-11-04 08:11:38 +05:30
Ernesto Ruiz
ad0dd693ac
chore: add translation function to Bank Reconciliation Tool related files
...
chore: add translation function to Bank Reconciliation Tool related files
2022-11-04 01:06:01 +05:30
Deepesh Garg
153675e52a
chore: Update patch
2022-11-04 01:03:45 +05:30
Deepesh Garg
e2ad785422
chore: Hide tax withholding net total field
2022-11-04 01:03:20 +05:30
rohitwaghchaure
0caa35a251
Merge branch 'develop' into fix/github-issue/29006
2022-11-03 16:12:53 +05:30
Rohit Waghchaure
e5b19e3f70
fix: auto increment qty if item table has no items
2022-11-03 14:57:36 +05:30
rohitwaghchaure
7a5a500d29
Merge pull request #32832 from rohitwaghchaure/fixed-customer-supplier-not-able-to-select
...
fix: not able to select customer / supplier
2022-11-03 11:54:58 +05:30
Rohit Waghchaure
b0fc568c80
fix: not able to select customer / supplier
2022-11-03 11:24:58 +05:30
niralisatapara
12456f9850
feat: item wise tds calculation
2022-11-03 10:46:30 +05:30
Deepesh Garg
f5478c871c
Merge pull request #32773 from AnandBaburajan/asset_bill_date_new
...
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-11-03 09:51:44 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9
...
fix: add missing translation function on report related documents
2022-11-03 09:46:43 +05:30
Anand Baburajan
c95f05a3dc
Merge branch 'develop' into asset_bill_date_new
2022-11-02 21:30:40 +05:30
Sagar Sharma
cd5836243d
Merge branch 'develop' into fix/github-issue/29006
2022-11-02 19:07:47 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po
...
fix: update advance paid in SO/PO from Payment Ledger
2022-11-02 16:27:56 +05:30
Sagar Sharma
25a2c8ab82
Merge pull request #32788 from s-aga-r/fix/github-issue/30339
...
fix: use `flt` instead of `cint` in `get_batch_no`
2022-11-02 15:54:41 +05:30
ruthra kumar
721ac6b847
test: SO advance paid on Payment submission and cancellation
2022-11-02 15:54:23 +05:30
ruthra kumar
1a0a8ac7e2
test: PO advance paid on payment submission and cancellation
2022-11-02 15:53:52 +05:30
ruthra kumar
81d791eea0
test: refactor use @change_settings decorator when possible
2022-11-02 15:40:56 +05:30
Rohit Waghchaure
e1f9ba78e5
fix: Scan Barcode UX
2022-11-02 15:37:46 +05:30
niralisatapara
ea387937d0
feat: item wise tds calculation
2022-11-02 12:30:58 +05:30
niralisatapara
2ca0cf6fc4
feat: item wise tds calculation
2022-11-02 12:19:51 +05:30
Sagar Sharma
be4593c1d9
Merge branch 'develop' into fix/github-issue/30339
2022-11-02 11:50:51 +05:30
Sagar Sharma
aa6e8c9ec0
Merge branch 'develop' into fix/github-issue/29006
2022-11-02 11:50:44 +05:30
niralisatapara
4aff2a32ad
Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop
2022-11-02 11:21:02 +05:30
Muvuk
579afed460
feat: Optional Hungarian COA for microenterprises #32688
2022-11-01 19:36:42 +01:00
rohitwaghchaure
a6a280669c
Merge pull request #32800 from rohitwaghchaure/test-cases-failing
...
fix: test cases
2022-11-01 22:51:31 +05:30
Rohit Waghchaure
3f2728e3f7
test: run tmate
2022-11-01 22:20:13 +05:30
