Deepesh Garg
5fe55176ec
chore: Enable no-copy for repost required field
2022-11-07 16:42:12 +05:30
Ankush Menat
30daeb90a8
fix: incorrect single valeu fetch
...
refer https://github.com/frappe/frappe/pull/18787
[skip ci]
2022-11-07 15:38:38 +05:30
Nihantra C. Patel
8355c1092c
fix: Increase columns width in Warehouse wise Item Balance Age and Value
2022-11-07 11:45:47 +05:30
rohitwaghchaure
5e7a69e649
Merge pull request #32802 from s-aga-r/fix/github-issue/29006
...
fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO
2022-11-07 09:35:39 +05:30
Daizy Modi
4efc947f14
perf: use get_cached_value instead of db.get_value in controllers ( #32776 )
2022-11-07 09:21:03 +05:30
Sagar Sharma
4d8da4420e
test: add test case for consumed-qty
2022-11-06 14:55:33 +05:30
Sagar Sharma
70c9b8dc50
fix: get consumed_qty based on received_qty in SCR
2022-11-06 13:33:47 +05:30
Sagar Sharma
c447dfaa9c
fix: set received_qty before_validate SCR
2022-11-06 13:32:15 +05:30
ruthra kumar
9209ec59c2
refactor: split delete gl utility function into two
2022-11-06 11:39:44 +05:30
Raffael Meyer
d2b6490bca
chore: add german translations ( #32846 )
...
Mostly for balance sheet
2022-11-06 10:22:33 +05:30
Deepesh Garg
8d30ebb12b
fix: Disable tax included prices for internal transfers ( #32794 )
...
* fix: Disable tax-included prices for internal transfers
2022-11-05 20:51:15 +05:30
Sagar Sharma
0394080898
Merge branch 'develop' into fix/github-issue/29006
2022-11-05 20:11:55 +05:30
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
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
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
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
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
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
Deepesh Garg
e0a705afe7
Merge pull request #32779 from deepeshgarg007/sales_invoice_default_mop
...
fix: Mode of payment for returns in POS Sales Invoice
2022-11-01 21:28:54 +05:30
Deepesh Garg
62ae329be3
Merge pull request #32801 from deepeshgarg007/purchase_invoice_cancel_amend
...
fix: Issues while cancel/amending Purchase Invoice with TDS enabled
2022-11-01 20:47:55 +05:30
Sagar Sharma
31f95da947
Merge branch 'develop' into fix/github-issue/30339
2022-11-01 20:30:55 +05:30
Deepesh Garg
a4f7079270
Merge branch 'develop' of https://github.com/frappe/erpnext into sales_invoice_default_mop
2022-11-01 20:17:43 +05:30
Deepesh Garg
5b74161195
chore: Update tests
2022-11-01 20:17:34 +05:30
Deepesh Garg
f7c9258770
fix: Issues while cancel/amending Purchase Invoice with TDS enabled
2022-11-01 19:54:41 +05:30
Sagar Sharma
8ea6983734
fix: Material Consumption option in case of Skip Transfer to WIP in WO
2022-11-01 19:43:06 +05:30
Rohit Waghchaure
ddd1b4be3f
fix: test cases
2022-11-01 19:30:37 +05:30
Anand Baburajan
05d2c7f9ae
Merge branch 'develop' into asset_bill_date_new
2022-11-01 17:45:23 +05:30
Dany Robert
1d83fb20d6
feat(pricing rule): free qty rounding and recursion qty ( #32577 )
...
Option to specify recursion start qty and repeating qty
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2022-11-01 16:39:32 +05:30
Maharshi Patel
6b0178e9fb
Merge branch 'develop' into fix-pricing-rule-item-group-uom
2022-11-01 15:21:41 +05:30
Maharshi Patel
cc6dfd91cf
Merge branch 'develop' into fix-pricing-rule-item-group-uom
2022-11-01 15:06:22 +05:30
Maharshi Patel
935f31eff9
fix: test cases added for item group
2022-11-01 12:55:46 +05:30
anandbaburajan
65e855bfff
fix: pro_rata_amount calculation in assets tests
2022-11-01 12:45:28 +05:30
Sagar Sharma
9fb3fb4c83
fix: use flt instead of cint in get_batch_no
2022-11-01 10:45:13 +05:30
ruthra kumar
4487065b67
fix: update advance paid in SO/PO from Payment Ledger
2022-11-01 10:29:31 +05:30
rohitwaghchaure
1033d34964
Merge pull request #32730 from rohitwaghchaure/duplicate-custom-fields-inventory-dimension
...
fix: duplicate custom fields for inventory dimension
2022-10-31 22:25:29 +05:30
Deepesh Garg
5b150abdcb
Merge pull request #32768 from deepeshgarg007/cc_main_allocation
...
fix: Budget validation for main cost center
2022-10-31 22:18:50 +05:30
Deepesh Garg
b98d25dafb
Merge pull request #32777 from deepeshgarg007/sales_order_advance_paid_amount
...
fix: Reset advance paid amount on Order cancel and amend
2022-10-31 21:38:43 +05:30
Deepesh Garg
06e8e28531
fix: Mode of payment for returns in POS Sales Invoice
2022-10-31 19:58:46 +05:30
Deepesh Garg
92f37ca111
fix: Reset advance paid amount on Oreder cancel and amend
2022-10-31 19:01:54 +05:30
Rohit Waghchaure
45ededbed5
fix: duplicate custom fields for inventory dimension
2022-10-31 15:33:23 +05:30
anandbaburajan
f322c608cf
fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date
2022-10-31 12:41:37 +05:30
gn306029
a612a666f3
chore: Update zh-TW translations ( #31775 )
2022-10-31 12:32:57 +08:00
Deepesh Garg
4e26d42d17
fix: Budget validation for main cost center
2022-10-30 19:33:27 +05:30
Hossein Yousefian
54c2ffc36b
fix: Pass project to stock entry items
...
fix: Pass project to stock entry items
2022-10-29 22:24:59 +05:30
Sagar Sharma
15ebf4a0cf
fix: add Sales Order reference in Material Request Dashboard
2022-10-29 12:01:37 +05:30
Deepesh Garg
cca36cab70
Merge pull request #32744 from ruthra-kumar/so_terms_report_enhancement
...
refactor: additional filters on Payment Terms status report
2022-10-29 11:09:43 +05:30
Deepesh Garg
49343e9f68
chore: column name
2022-10-28 22:03:09 +05:30
Deepesh Garg
b6ade62211
Merge pull request #32662 from s-aga-r/refactor/stock/remaining-reports
...
refactor: rewrite stock reports queries in qb
2022-10-28 21:05:15 +05:30
Deepesh Garg
323e45374f
Merge pull request #32620 from rtdany10/psa_pdf_issue
...
feat: page break in SoA pdf
2022-10-28 21:00:01 +05:30
Deepesh Garg
aee4fe9f7b
Merge pull request #32722 from deepeshgarg007/reference_due_date
...
fix: Reference due date field type in Journal Entry Accounts table
2022-10-28 20:55:36 +05:30
Deepesh Garg
50652be6e3
Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice
2022-10-28 20:48:26 +05:30
Deepesh Garg
92f2d9f99f
Merge pull request #32725 from ernestoruiz89/patch-10
...
fix: add translate function on remark text on asset_value_adjustment.py
2022-10-28 20:47:00 +05:30
Deepesh Garg
25eac80ae6
Merge pull request #32718 from deepeshgarg007/total_sales_amount_project
...
fix: Total Sales amount update in project via Sales Order
2022-10-28 20:46:00 +05:30
Deepesh Garg
9ac1c4bc4f
Merge pull request #32699 from deepeshgarg007/general_ledeger_print
...
fix: Curreny in SOA print for multi-currency party
2022-10-28 20:41:49 +05:30
Deepesh Garg
c3275c3f3c
Merge pull request #32692 from deepeshgarg007/opening_invoice_creation_tool_ux
...
fix: Clear invoice table post importing invoices
2022-10-28 20:40:52 +05:30
Deepesh Garg
d9eda45b0b
chore: Minor updates
2022-10-28 20:19:13 +05:30
Deepesh Garg
b9d497c61c
chore: Update patch
2022-10-28 20:18:55 +05:30
ruthra kumar
fed39a53cb
test: due date filter on Payment Terms report
2022-10-28 18:15:58 +05:30
ruthra kumar
4765f937ea
fix: key error in filter access
2022-10-28 17:50:01 +05:30
ruthra kumar
aadb6b1772
feat: additional filters on Payment terms report
...
Filter on Status and Due dates
2022-10-28 17:46:06 +05:30
Deepesh Garg
fb41bdd700
Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice
2022-10-28 17:18:11 +05:30
