CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 11:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,003 Commits 424 Branches 1,724 Tags
482996f8d11b09f90a3235f81367db0ee61a6779
Commit Graph

31003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Afshan
482996f8d1 fix: using ORM 2020-12-03 15:14:30 +05:30
Afshan
785579e67b fix: payroll attendance error 2020-12-03 15:11:34 +05:30
Deepesh Garg
74224d90bf Merge pull request #23966 from deepeshgarg007/unpaid_subscription_fix 
fix: Invoice generation for Unpaid subscriptions
 2020-12-02 20:03:42 +05:30
Deepesh Garg
f940a3494f Merge pull request #24020 from deepeshgarg007/gstr-1-b2c_large 
fix: Opening invoices in GSTR-1 report
 2020-11-30 10:57:49 +05:30
Deepesh Garg
f08c2a5cef Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into unpaid_subscription_fix 2020-11-29 22:48:46 +05:30
Deepesh Garg
d8b4044ee1 fix: Add check to generate new invoices 2020-11-29 22:48:05 +05:30
rohitwaghchaure
78e737de5a Merge pull request #24013 from rohitwaghchaure/fixed-incoming-rate-for-finished-good 
fix: incoming rate for finished good
 2020-11-28 19:37:21 +05:30
Deepesh Garg
02feab9f3c fix: Opening invoices in GSTR-1 report 2020-11-27 21:55:02 +05:30
Rohit Waghchaure
3ef60dbfdb fix: incoming rate for finished good 2020-11-27 17:21:05 +05:30
Jannat Patel
42b24cc9eb fix: job card error handling for operations field (#23996) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-11-25 09:07:57 +05:30
rohitwaghchaure
ca05945e92 fix: incorrect balance value in stock balance report (#23997) 2020-11-25 08:58:58 +05:30
rohitwaghchaure
a69b9f95cc Merge pull request #23993 from rohitwaghchaure/bom-stock-project-item-color 
fix: bom stock report color showing always red
 2020-11-24 17:00:49 +05:30
Rohit Waghchaure
f9e62b74d0 fix: bom stock report color showing always red 2020-11-24 16:56:20 +05:30
Afshan
2b3a20ed5b fix: clear error message when approval not availab (#23972) 
le
 2020-11-24 08:01:43 +05:30
Jannat Patel
3d84d324d7 fix: purchase receipt to purchase invoice bill date mapping (#23968) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2020-11-23 16:29:42 +05:30
Anurag Mishra
47bdbf1e78 Merge pull request #23979 from rohitwaghchaure/color-not-showing-in-bom-stock-report 
fix: bom stock report color issue
 2020-11-23 16:14:01 +05:30
Rohit Waghchaure
0cb6ce3a89 fix: bom stock report color issue 2020-11-23 14:11:24 +05:30
rohitwaghchaure
5597737dca Merge pull request #23958 from rohitwaghchaure/incorrect-delink-serial-no-and-batch-v12-hotfix 
fix: incorrect delink serial no and batch
 2020-11-20 13:45:32 +05:30
Rohit Waghchaure
77b9fa0d06 fix: incorrect delink serial no and batch 2020-11-20 00:26:36 +05:30
Deepesh Garg
224006aebd fix: Invoice generation for Unpaid subscriptions 2020-11-19 19:39:08 +05:30
rohitwaghchaure
1e4a6e845b Merge pull request #23956 from rohitwaghchaure/split-mysql-query-to_update-quantity-hotfix 
fix: Table 'tabStock Entry Detail' is specified twice
 2020-11-19 14:06:09 +05:30
Rohit Waghchaure
0433fa58f3 fix: Table 'tabStock Entry Detail' is specified twice 2020-11-19 12:52:17 +05:30
Deepesh Garg
fac940042b Merge pull request #23954 from vorasmit/fix-sez-v12 
fix(regional): set proper state code in ewaybill JSON when GST category is SEZ
 2020-11-18 21:51:12 +05:30
Smit Vora
3e36d774d2 fix(regional): set proper state code in ewaybill JSON when GST category is SEZ 2020-11-18 21:03:45 +05:30
Marica
36706b7cb0 chore: Revert "fix: Received/Delivered Items to Billed Logic" (#23948) 
This reverts commit 4f008f59fc.
 2020-11-18 20:54:33 +05:30
rohitwaghchaure
d920f9da59 Merge pull request #23938 from rohitwaghchaure/duplicate-stock-transactions-created 
fix: incorrect stock ledger entries for stock reco
 2020-11-18 18:16:58 +05:30
Rohit Waghchaure
f041af53db fix: stock ledger entries for stock reco 2020-11-18 17:15:57 +05:30
Marica
5111882162 Merge pull request #23927 from marination/employee-relieving-fix 
fix: Hide Ex-Employees from Employee Tree and minor message UX
 2020-11-17 15:15:45 +05:30
Marica
e37604baeb Merge branch 'version-12-hotfix' into employee-relieving-fix 2020-11-17 15:15:08 +05:30
Marica
0e91805719 Merge pull request #23931 from marination/item-link-formatter-hotfix 
fix: Item Link Formatter Behaviour
 2020-11-17 13:28:52 +05:30
Marica
3377e74fd0 Merge branch 'version-12-hotfix' into item-link-formatter-hotfix 2020-11-17 13:27:58 +05:30
Marica
d87094ebb2 Merge pull request #23928 from marination/bank-reconciliation-hotfix 
fix: Sequence Matcher shouldn't get None input
 2020-11-17 13:26:58 +05:30
Marica
c7d68a7f41 Merge pull request #23930 from marination/payment-reco-mandatory-check-hotfix 
fix: Payment Reconciliation client side validations
 2020-11-17 13:24:11 +05:30
marination
3bbed22f04 fix: Item Link Formatter Behaviour 2020-11-17 13:19:53 +05:30
Marica
aab91990e5 Merge pull request #23929 from marination/payment-entry-list-view-hotfix 
fix: Check if list view standard filter exists in Payment Entry
 2020-11-17 13:14:06 +05:30
marination
2e23050338 fix: Missing semicolon 2020-11-17 13:11:18 +05:30
marination
5ea276d29d fix: Payment Reconciliation client side validations 2020-11-17 13:11:09 +05:30
marination
7e18df31bf fix: Check if list view standard filter exists in Payment Entry 2020-11-17 13:08:33 +05:30
Marica
2c29933118 fix: Sequence Matcher shouldn't get None input (#23539) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-17 13:05:31 +05:30
Marica
9525bffcd9 fix: Hide Ex-Employees from Employee Tree and minor message UX 
* fix: Hide Ex-Employees from Employee Tree and minor message UX

* fix: translation syntax
 2020-11-17 12:58:31 +05:30
rohitwaghchaure
d3074c32fd fix: stock ageing report not working (#23924) 2020-11-17 12:10:05 +05:30
Suraj Shetty
fe56015cbf fix: Handle the "no leave_allocation found" case (#23920) 2020-11-17 12:07:53 +05:30
Saqib
789f1007b9 fix: asset finance book posting date fix (#23780) 
* fix: asset finance book posting date fix

* fix: cannot save asset

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-17 11:53:37 +05:30
Saqib
8b7d4a3f2e feat: re-linking bank accounts with plaid (#23913) 2020-11-17 11:27:11 +05:30
Marica
b9efb4577a fix: Don't overrule Item Price via Pricing Rule Rate if 0 (#23915) 
* fix: Dont overrule Item Price via Pricing Rule Rate if 0

* chore: Pricing Rule with Item Price Test
 2020-11-17 11:17:05 +05:30
Marica
b5217ee9d7 fix: Don't copy terms, discount and required by from SO to PO (#23904) 
* fix: Dont copy terms, discount and required by from SO to PO

* fix: Let delivery date and required by date get mapped
 2020-11-17 11:14:33 +05:30
rohitwaghchaure
e8610014de fix: donot add same packing item multiple time in product bundle (#23898) 2020-11-17 11:11:23 +05:30
Suraj Shetty
519f5b5411 fix: Typo (Enchashment > Encashment) (#23917) 2020-11-17 10:42:23 +05:30
Shivam Mishra
e1b96d70db refactor: show form buttons only if permissions exist (#23889) 
* refactor: show form buttons only if permissions exist

* fix: missing semicolon

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-15 16:42:55 +05:30
Marica
31e2c80e33 Merge pull request #23895 from marination/po-to-so-hotfix 
fix:  SO to PO flow improvement
 2020-11-13 11:26:14 +05:30