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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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
|
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 |
|