ChillarAnand
|
0c0a9ed96d
|
refactor: Remove non-profit domain from ERPNext
|
2022-01-06 09:53:49 +05:30 |
|
Rucha Mahabal
|
ac816f4fed
|
fix(UX): validate setup on clicking Mark Attendance button in Shift Type (#29146)
|
2022-01-04 21:46:31 +05:30 |
|
Rucha Mahabal
|
72ef35bace
|
Merge branch 'develop' into accounting-dimension-mapping
|
2022-01-04 19:59:02 +05:30 |
|
Subin Tom
|
3febca1a9a
|
fix: Modifying Opening invoice creation tool timestamp (#29127)
|
2022-01-04 19:37:44 +05:30 |
|
Rucha Mahabal
|
5eeb94db31
|
fix: map Accounting Dimensions for Bank Entry against Payroll Entry
|
2022-01-04 19:21:16 +05:30 |
|
Subin Tom
|
19bb01c973
|
fix: POS items added to cart despite low qty (#29126)
|
2022-01-04 19:14:40 +05:30 |
|
Saqib Ansari
|
f4db474be0
|
fix: minor issues (#29130)
|
2022-01-04 19:12:19 +05:30 |
|
Anupam Kumar
|
08dcbd6fce
|
feat: allow user to change the parent company
|
2022-01-04 19:05:36 +05:30 |
|
Ankush Menat
|
733c9defdf
|
fix: update idx after updating items in so/po (#29134)
|
2022-01-04 18:39:30 +05:30 |
|
Chillar Anand
|
0900c3d655
|
refactor: Removed agriculture module from ERPNext (#29022)
|
2022-01-04 17:26:11 +05:30 |
|
Ankush Menat
|
e73c51bee6
|
test: fix test broken by todo schema change
|
2022-01-04 17:23:03 +05:30 |
|
Nabin Hait
|
11cfa16158
|
fix: future recurring period calculation (#29083)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
|
2022-01-04 11:38:49 +05:30 |
|
Saqib Ansari
|
7e777356ee
|
Merge pull request #28160 from resilient-tech/fix-invoice-statuses
refactor: `update_invoice_status` with query builder
|
2022-01-03 17:59:11 +05:30 |
|
Subin Tom
|
7385497219
|
fix: using get_batch_qty method to get available_qty
|
2022-01-03 16:57:00 +05:30 |
|
Subin Tom
|
267da48889
|
fix: added Sum() in query
|
2022-01-03 16:40:11 +05:30 |
|
Saqib Ansari
|
568550874d
|
Merge branch 'develop' into pos-batch-no-stock-validation
|
2022-01-03 14:46:29 +05:30 |
|
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 |
|
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 |
|
Pruthvi Patel
|
fc0dd3fcd7
|
Merge branch 'develop' into fix-invoice-statuses
|
2021-12-29 13:45:35 +05:45 |
|
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 |
|
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
|
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 |
|