Commit Graph

43393 Commits

Author SHA1 Message Date
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
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
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
Deepesh Garg
9c57f3d339
Merge pull request #32639 from maharshivpatel/fix-pricing-rule-item-group-uom
fix: Pricing rule item group consider UOM
2022-11-01 16:20:53 +05:30
Maharshi Patel
6b0178e9fb
Merge branch 'develop' into fix-pricing-rule-item-group-uom 2022-11-01 15:21:41 +05:30
rohitwaghchaure
790b371e47
Merge pull request #32790 from AnandBaburajan/asset_scrap_and_sale_tests_fix
fix: pro_rata_amount calculation in assets tests
2022-11-01 15:16:06 +05:30
Maharshi Patel
cc6dfd91cf
Merge branch 'develop' into fix-pricing-rule-item-group-uom 2022-11-01 15:06:22 +05:30
anandbaburajan
672fbd3849 chore: empty commit to try fixing stuck test 2022-11-01 14:25:38 +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
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
Deepesh Garg
3a420ec808
Merge pull request #32772 from gn306029/develop
chore: Update zh-TW translations (#31775)
2022-10-31 17:43:36 +05:30
Rohit Waghchaure
45ededbed5 fix: duplicate custom fields for inventory dimension 2022-10-31 15:33:23 +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
16a8bcc77d
Merge pull request #32754 from s-aga-r/fix/github-issue/32734
fix: add `Sales Order` reference in Material Request Dashboard
2022-10-29 12:36:37 +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
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
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
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
Sagar Sharma
c71f805667
Merge pull request #32738 from vishdha/pr_dashboard
fix: Added Material Request Reference in Purchase Recipt Dashboard for Tracking
2022-10-28 14:23:54 +05:30
Vishal Dhayagude
db0f2c0b10
Merge branch 'develop' into pr_dashboard 2022-10-28 13:36:43 +05:30
Deepesh Garg
09fa2298ba
Merge pull request #32716 from deepeshgarg007/bank_account_filter
fix: Company bank account filter in Bank Clearance
2022-10-28 12:53:53 +05:30
Vishal
e8c0157017 chore: minor linting issue fixed 2022-10-28 11:59:10 +05:30
Vishal
a04c44fe34 chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking 2022-10-28 11:36:14 +05:30
Sagar Sharma
334b158f0b
Merge branch 'develop' into refactor/stock/remaining-reports 2022-10-28 11:27:42 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse
fix: Add condition for discount section collapse
2022-10-28 11:24:25 +05:30
Deepesh Garg
591291caee
Merge pull request #32724 from deepeshgarg007/ap_report_filter_fixes
fix: Filter fixes in Accounts Payable report
2022-10-28 11:23:52 +05:30
Dany Robert
de20dfe459
chore: remove commented line 2022-10-27 09:33:49 +05:30
Ernesto Ruiz
8f0e63cd27
fix: add translate function on remark text on make_depreciation_entry in asset_value_adjustment.py 2022-10-26 13:56:35 -06:00
Deepesh Garg
a5a73ba857 fix: Filter fixes in Accounts Payable report 2022-10-26 21:18:50 +05:30
Deepesh Garg
e7caa48e2f fix: Reference due date field type in Journal Entry Accounts table 2022-10-26 20:21:36 +05:30
Deepesh Garg
6063c4e3c0 fix: Total Sales amount update in project via Sales Order 2022-10-26 18:01:39 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30