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
|
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 |
|
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 |
|
Deepesh Garg
|
f9f78c1086
|
fix: Company bank account filter in Bank Clearance
|
2022-10-26 11:02:14 +05:30 |
|
Ernesto Ruiz
|
4c7fa9482d
|
fix: correct linters
|
2022-10-25 22:39:05 -06:00 |
|
Ernesto Ruiz
|
9c529c61bb
|
fix: correct linters
|
2022-10-25 22:35:37 -06:00 |
|
Ernesto Ruiz
|
b7b53b5857
|
fix: correct linters
|
2022-10-25 22:34:21 -06:00 |
|
Ernesto Ruiz
|
2012bdf4bd
|
fix: add translate function to string on budget_variance_report.js to match the variance word translated
|
2022-10-25 22:24:33 -06:00 |
|
Ernesto Ruiz
|
48ed6381b3
|
fix: add translate function to name of chart labels in budget_variance_report.py
|
2022-10-25 22:18:47 -06:00 |
|
Ernesto Ruiz
|
083a78135c
|
fix: add translate function to period in sales_analytics.py
|
2022-10-25 22:17:06 -06:00 |
|
Ernesto Ruiz
|
c1e608d9ef
|
fix: add translate function to period in stock_analytics.py
|
2022-10-25 22:09:02 -06:00 |
|
Ernesto Ruiz
|
71a0ae2e59
|
fix: refactor code for better translatable string in stock_ageing.py
|
2022-10-25 22:05:25 -06:00 |
|
Ernesto Ruiz
|
a671652ab2
|
fix: refactor code for better translatable string
|
2022-10-25 22:00:46 -06:00 |
|
Ernesto Ruiz
|
a963618b08
|
fix: add translate function to name of chart labels in deferred_revenue_and_expense.py
|
2022-10-25 21:54:55 -06:00 |
|
niralisatapara
|
397e3b1ade
|
feat: item wise tds calculation
item wise tds calculation
|
2022-10-25 15:09:59 +05:30 |
|
Deepesh Garg
|
a18a715bb4
|
chore: Use account currency as fallback
|
2022-10-24 19:13:02 +05:30 |
|
Deepesh Garg
|
49ee873655
|
fix: Curreny in SOA print for multi-currency party
|
2022-10-24 17:34:12 +05:30 |
|
Rohit Waghchaure
|
5f84993bae
|
test: added test case to validate seachfields for customer, supplier
|
2022-10-24 16:10:47 +05:30 |
|
Rohit Waghchaure
|
46d148defd
|
fix: searchfield not working for cuctsomer, supplier as per customize form
|
2022-10-24 15:48:34 +05:30 |
|
Deepesh Garg
|
267e7c3a90
|
fix: Clear invoice table post importing invoices
|
2022-10-24 11:45:24 +05:30 |
|
Deepesh Garg
|
48808aeb8a
|
Merge pull request #32424 from deepeshgarg007/loan_schedule_types
feat: Repayment schedule types for term loans
|
2022-10-23 19:37:40 +05:30 |
|
Deepesh Garg
|
e59b147a62
|
chore: Update tests
|
2022-10-23 18:51:51 +05:30 |
|
Deepesh Garg
|
77d509eb9a
|
Merge pull request #32650 from barredterra/unset-contact-details
fix: unset contact details
|
2022-10-23 18:21:01 +05:30 |
|
Deepesh Garg
|
ef0cb17faf
|
chore: Add repayment date on option
|
2022-10-22 23:46:01 +05:30 |
|
Sagar Sharma
|
26c00f8dd3
|
Merge branch 'develop' into refactor/stock/remaining-reports
|
2022-10-21 15:19:23 +05:30 |
|
Sagar Sharma
|
40bd121593
|
refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB
|
2022-10-21 14:49:12 +05:30 |
|
Sagar Sharma
|
cde785f1bb
|
refactor: rewrite Product Bundle Balance Report queries in QB
|
2022-10-21 14:49:09 +05:30 |
|
Sagar Sharma
|
feaa2dbba8
|
refactor: rewrite Stock Ledger Report queries in QB
|
2022-10-21 13:12:34 +05:30 |
|
ruthra kumar
|
eedf7e44a2
|
Merge pull request #32651 from ruthra-kumar/report_payment_ledger
feat: Payment Ledger report
|
2022-10-21 11:25:24 +05:30 |
|
Deepesh Garg
|
51d8e9dc5e
|
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types
|
2022-10-20 18:35:16 +05:30 |
|
Deepesh Garg
|
2a50a0ce69
|
Merge pull request #32551 from codezart/subscription-plan-fix-months
fix: number of months subscription plan
|
2022-10-20 17:24:24 +05:30 |
|
Ankush Menat
|
11207c4e56
|
fix: dont update item info twice
[skip ci]
|
2022-10-20 16:18:48 +05:30 |
|
Devin Slauenwhite
|
b88e850d55
|
perf: cache barcode scan result (#32629)
* perf: cache barcode scan result
* feat: BarcodeScanResult type
* fix: use safe `get_value` `set_value`
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
|
2022-10-20 15:56:07 +05:30 |
|
rohitwaghchaure
|
adeb1f92c8
|
Merge pull request #32667 from rohitwaghchaure/fixed-bom-cost-update-message
fix: BOM cost update message
|
2022-10-20 14:36:43 +05:30 |
|
Rohit Waghchaure
|
9cfe527492
|
fix: BOM cost update message
|
2022-10-20 13:49:46 +05:30 |
|
Deepesh Garg
|
1ca472cc8a
|
chore: Linting issues
|
2022-10-20 12:09:42 +05:30 |
|
Deepesh Garg
|
b4d008b743
|
Merge branch 'develop' into subscription-plan-fix-months
|
2022-10-20 12:07:44 +05:30 |
|
Deepesh Garg
|
ae54610b2a
|
Merge pull request #32659 from deepeshgarg007/inter_company_purchase_doc_address
fix: Billing Address for inter-company purchase docs
|
2022-10-20 11:58:53 +05:30 |
|
rohitwaghchaure
|
873502c95d
|
Merge pull request #32654 from rohitwaghchaure/fixed-conversion-issue-in-material-request
fix: incorrect qty in material request created from PP
|
2022-10-20 09:59:19 +05:30 |
|
Deepesh Garg
|
796f2d3c09
|
fix: Billing Address for inter-company purchase docs
|
2022-10-19 23:50:39 +05:30 |
|
FinByz Tech Pvt. Ltd
|
c52b41d311
|
feat(report): added account wise redirection
* feat(report):added account wise redirection
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
|
2022-10-19 23:14:10 +05:30 |
|
Raffael Meyer
|
4ad3002861
|
fix: allow to create Sales Order from expired Quotation (#32641)
|
2022-10-19 22:07:02 +05:30 |
|
ruthra kumar
|
6e55b419a6
|
test: invoice outstandings and payments
|
2022-10-19 21:49:13 +05:30 |
|
ruthra kumar
|
8f60f0a0cf
|
feat: Basic Payment Ledger report
|
2022-10-19 21:49:08 +05:30 |
|
Rohit Waghchaure
|
4d5ef721f7
|
test: validate qty and purchase uom in material request which is created from PP
|
2022-10-19 19:08:27 +05:30 |
|
Rohit Waghchaure
|
ad278b2007
|
fix: incorrect qty in material request
|
2022-10-19 18:38:34 +05:30 |
|
rohitwaghchaure
|
de4c0528f9
|
Merge pull request #32645 from rohitwaghchaure/fixed-capacity-planning-error
fix: overlap error not raised for job card in case of workstation with production capacity
|
2022-10-19 17:04:48 +05:30 |
|
barredterra
|
23f0bb45b0
|
fix: unset contact details
|
2022-10-19 12:26:56 +02:00 |
|
Deepesh Garg
|
430492152f
|
fix: Advance paid amount in orders (#32642)
|
2022-10-19 15:37:13 +05:30 |
|
niralisatapara
|
4a35a224e2
|
feat: Item Wise TDS Calculation
|
2022-10-19 15:34:41 +05:30 |
|
niralisatapara
|
21d09c5bf2
|
Item Wise TDS Calculation
|
2022-10-19 14:33:02 +05:30 |
|
Rohit Waghchaure
|
8b2165e0d1
|
fix: overlap error not raised for job card in case of workstation with production capacity
|
2022-10-19 14:19:50 +05:30 |
|
Maharshi Patel
|
d100e68fd0
|
Merge branch 'frappe:develop' into fix-pricing-rule-item-group-uom
|
2022-10-19 11:08:05 +05:30 |
|
ruthra kumar
|
f844097f8e
|
Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding
fix: Integrity Error on PLE while submitting sales invoice
|
2022-10-19 09:43:24 +05:30 |
|
Maharshi Patel
|
96b4211ea1
|
fix: pricing rule for non stock UOM and conversions
* fix: pricing rule for non stock UOM and conversions
|
2022-10-18 22:26:11 +05:30 |
|
ruthra kumar
|
8f42e7f703
|
test: use payable account in tax and to trigger party validation
|
2022-10-18 17:27:46 +05:30 |
|
Sagar Sharma
|
ae8a63827d
|
Merge branch 'develop' into refactor/stock/reports
|
2022-10-18 10:48:52 +05:30 |
|