rohitwaghchaure
f02e6b4631
fix: incorrect posting time fetching incorrect qty ( #29103 )
2022-01-03 14:28:34 +05:30
Saqib Ansari
d0f5beeb34
fix: filter query in bank reconciliation tool ( #29098 )
2022-01-03 11:33:03 +05:30
rohitwaghchaure
650b388bc1
Merge pull request #28458 from anupamvs/crm-carry-forward-communication-comments
...
feat: carry forward communication and comments throughout the sales c…
2022-01-03 10:19:56 +05:30
Conor
d2074b16db
ci: postgres unittests configurations ( #28952 )
...
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-01-02 23:33:10 +05:30
Deepesh Garg
f56deebb97
Merge pull request #29094 from frappe/mergify/bp/develop/pr-29092
...
fix(India): Tax and Charges template not getting fetched based on tax category assigned (backport #29092 )
2022-01-02 19:42:38 +05:30
Deepesh Garg
c3d890f3f1
fix: get fiscal year based on date
2022-01-02 19:10:49 +05:30
Deepesh Garg
4b6217a683
fix: Test Case
...
(cherry picked from commit 342658ea7028cc0d890200364cc08cf97e55d6d0)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
2022-01-02 13:36:43 +00:00
Deepesh Garg
466e549842
fix(India): Tax and Charges template not getting fetched based on tax category assigned
...
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
2022-01-02 13:36:41 +00:00
Deepesh Garg
db829a0610
Merge pull request #29050 from mohsinalimat/patch-1
...
feat: Add currency in import download statement
2022-01-02 17:15:01 +05:30
Deepesh Garg
ebc1039610
Merge pull request #29070 from frappe/pr-addded-to-po-dashboard
...
refactor: Payment Request added to PO Dashboard
2022-01-02 17:04:12 +05:30
Deepesh Garg
9c1773f56e
Merge pull request #28812 from rtdany10/ledger-merger
...
feat: ledger merger
2022-01-02 16:45:48 +05:30
Deepesh Garg
9199513de4
Merge pull request #29037 from wojosc/patch-20
...
feat: update de.csv
2022-01-02 16:29:43 +05:30
Raffael Meyer
a4e3d79bc1
revert: german translation of "Minute"
2021-12-31 17:43:10 +01:00
Raffael Meyer
538dffa617
fix: apply suggestions from review
2021-12-31 14:12:28 +01:00
Vaibhav Chopra
dbbc8d8aed
fix: leave_allocation variable not being defined ( #29086 )
2021-12-31 13:34:20 +05:30
Dany Robert
321730a88e
Merge branch 'develop' into ledger-merger
2021-12-31 13:02:12 +05:30
MohsinAli
72369092a3
Merge branch 'develop' into patch-1
2021-12-30 17:13:59 +05:30
Kanchan Chauhan
8c4cdf7afc
refactor: Payment Request added to PO Dashboard
2021-12-29 16:44:20 +05:30
rohitwaghchaure
56b9ad8303
Merge pull request #29064 from rohitwaghchaure/optimize-patch-for-update-bom-in-so-mr
...
fix: optimize patch for update bom in SO and MR
2021-12-29 12:08:27 +05:30
Rohit Waghchaure
d9b9f4e8b7
fix: optimize patch for update bom in SO and MR
2021-12-29 10:14:03 +05:30
Deepesh Garg
b1d8815556
Merge pull request #28034 from deepeshgarg007/term_loan_enhancement
...
fix: Updates in term loan processing
2021-12-28 18:39:31 +05:30
Deepesh Garg
68d49817a1
fix: Add test for loan repayment cancellation
2021-12-28 18:10:52 +05:30
Deepesh Garg
f78bf4c6ef
fix: Test cases
2021-12-28 17:40:05 +05:30
Rucha Mahabal
091e0bd72a
feat: Provision to assign multiple payroll cost centers against a single employee ( #29024 )
...
* feat: Provision to assign multiple payroll cost centers against a single employee
* fix: get fallback cost center from Employee/Department
* fix: linter issues
* fix: convert raw queries with frappe ORM
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-12-28 17:30:50 +05:30
Anupam Kumar
2fd870ff15
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-28 17:21:51 +05:30
Deepesh Garg
be5e6f02ae
Merge branch 'develop' of https://github.com/frappe/erpnext into term_loan_enhancement
2021-12-28 17:14:24 +05:30
Rucha Mahabal
251ed3aa74
Merge branch 'develop' into multiple-cost-centers-against-employee
2021-12-28 17:10:32 +05:30
Rucha Mahabal
88df5ce530
fix: tests ( #29051 )
...
* fix(test): create salary slip as per timesheet dates for Project Profitability
* fix(test): reload salary slip before checking for payment days
2021-12-28 17:09:46 +05:30
Ankush Menat
087ebcae5a
Merge pull request #29014 from ankush/rename_sr_no
...
fix!: disable renaming on serial nos
2021-12-28 15:34:50 +05:30
Deepesh Garg
2248841d8a
Merge pull request #29054 from frappe/mergify/bp/develop/pr-28996
...
fix: Issues in Bank Reconciliation tool (backport #28996 )
2021-12-28 15:17:51 +05:30
Deepesh Garg
6405699821
Merge branch 'develop' into mergify/bp/develop/pr-28996
2021-12-28 14:46:12 +05:30
Marica
27b157de22
Merge pull request #29057 from deepeshgarg007/unit_test_fixes
...
fix: Deferred revenue test case
2021-12-28 14:43:53 +05:30
Marica
18eb47f693
Merge pull request #28555 from marination/independent-manu-entry
...
fix: Validate Finished Goods for Independent Manufacture entries as well
2021-12-28 14:36:32 +05:30
Deepesh Garg
6f933db3cc
fix: Deferred revenue test case
2021-12-28 14:16:19 +05:30
Development for People
095a6e186f
fix: rename non existent doctype field to the right one ( #29055 )
2021-12-28 14:08:22 +05:30
Deepesh Garg
057cfb22d6
fix: Remove debug statement
...
(cherry picked from commit becb39da902e7e113c3dacb7eee7921144b8e99d)
2021-12-28 08:11:18 +00:00
Deepesh Garg
d807d78313
fix: Issues in Bank Reconciliation tool
...
(cherry picked from commit ff183ee895fb0dd1ca595eb76e2286695063315a)
2021-12-28 08:11:18 +00:00
Marica
02b9541b43
Merge branch 'develop' into independent-manu-entry
2021-12-28 13:26:00 +05:30
marination
22809a2838
fix: Avoid Impact on Repack Entry
...
- Repack entries must be considered for fg/scrap checkbox auto set
- This must be avoided only for Manufacture entries, due to confusion between scrap and fg
- No scrap in repack, so its straight forward
2021-12-28 13:23:27 +05:30
marination
7d0340e660
fix: Sider
2021-12-28 13:06:35 +05:30
Anupam Kumar
6b9dfaea72
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-28 12:45:48 +05:30
Marica
b8c212aaef
Merge pull request #28966 from marination/stock-ageing-negative-stock
...
fix: Stock Ageing Report - Negative Opening Stock
2021-12-28 12:23:55 +05:30
Deepesh Garg
d02dcb6433
Merge pull request #29009 from deepeshgarg007/deferred_service_start_date_validate
...
fix: Start date validation for deferred invoices
2021-12-28 12:05:34 +05:30
Marica
09f26d8258
Merge branch 'develop' into stock-ageing-negative-stock
2021-12-28 11:50:00 +05:30
marination
6ca978c18b
fix: Linter (extra line after import)
2021-12-28 11:46:46 +05:30
Deepesh Garg
3607f51610
Merge pull request #29021 from anupamvs/project-form-custom-btn-grouping
...
fix: grouping project form custom buttons
2021-12-28 11:08:36 +05:30
Deepesh Garg
077e2c6467
Update erpnext/projects/doctype/project/project.js
2021-12-28 11:08:13 +05:30
Anupam Kumar
1c0fa3c231
Merge branch 'develop' into crm-carry-forward-communication-comments
2021-12-28 10:34:16 +05:30
MohsinAli
a0863d1cb1
feat: Add currency in import download statement
...
Add currency in bank statement import
2021-12-28 10:27:19 +05:30
Rucha Mahabal
baa12bcee6
fix: convert raw queries with frappe ORM
2021-12-28 10:04:14 +05:30
