nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 16:21:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,083 Commits 458 Branches 1,746 Tags
7cf5dc7dab788a2534ea7cf7caf0b2ff080e16d6
Commit Graph

32083 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Smit Vora
c630be6781 fix: remove unused imports 2020-11-19 19:13:06 +05:30
Smit Vora
51a153d8c2 fix: removed unused code 2020-11-19 19:03:22 +05:30
Smit Vora
707b630851 fix: add remarks to sales invoice 2020-11-19 18:42:39 +05:30
Saurabh
fdacb5643b Merge branch 'v12-pre-release' into version-12 v12.14.0 2020-11-19 15:39:04 +05:30
Saurabh
ec89a65859 bumped to version 12.14.0 2020-11-19 15:59:04 +05:50
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
rohitwaghchaure
5c72ad2498 fix: Table 'tabStock Entry Detail' is specified twice (#23952) 2020-11-19 12:45:40 +05:30
rohitwaghchaure
c976d080ea fix: stock ledger entries for stock reco (#23955) 2020-11-19 08:15:41 +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
507c46d9a4 chore: Revert "fix: Received/Delivered Items to Billed Logic" (#23950) 
This reverts commit 4f008f59fc.
 2020-11-18 20:54:43 +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
Nabin Hait
18471131cc chore: added change log for v12.14.0 (#23951) 2020-11-18 19:27:00 +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
Nabin Hait
6ba0b69469 Merge branch 'version-12-hotfix' into v12-pre-release 2020-11-17 12:18:55 +05:30
rohitwaghchaure
9f93a4069a Merge pull request #23926 from rohitwaghchaure/fixed-stock-ageing-report-not-working-pre-release 
fix: stock ageing report not working
 2020-11-17 12:18:14 +05:30
Rohit Waghchaure
a73c662a38 fix: stock ageing report not working 2020-11-17 12:16:17 +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
Suraj Shetty
f202a49d80 Revert "feat: e invoicing with JSON files" (#23925) 2020-11-17 11:44:55 +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
780982dcc7 fix: Handle the "no leave_allocation found" case (#23921) 2020-11-17 11:02:15 +05:30
Suraj Shetty
26b802d44a fix: Typo (Enchashment > Encashment) (#23918) 2020-11-17 10:43:55 +05:30
Suraj Shetty
519f5b5411 fix: Typo (Enchashment > Encashment) (#23917) 2020-11-17 10:42:23 +05:30
Suraj Shetty
aebeb573e4 Merge branch 'version-12-hotfix' of github.com:frappe/erpnext into v12-pre-release 2020-11-17 10:15:52 +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
marination
09e1b5314b fix: Make sure row object has doctype so that read only property is applied to rows 2020-11-12 12:27:26 +05:30
marination
40ba013636 fix: SO to PO Mapping Issue 
- removed type: GET , which made the URL longer
- Added only relevant fields from Items table to Dialog table to reduce args load
- Made separate method to set table data in dialog
- Added freeze message
 2020-11-12 12:27:06 +05:30
Marica
16427c5cc8 fix: SO to PO flow improvement (#23357) 
* fix: SO to PO flow improvement

* fix: Dont map shipping_address

- shipping_address is a text field in SO and link field in PO
- Drop shipping case handles its mapping
- normal case doesnt need to map

* fix: Hide/Add rows depending on Against Default Supplier

* fix: Removed Default Supplier Select field from popup

- removed Default Supplier Select field from popup
- only loop through suppliers of selected items if via default supplier
- only check for items in selected items

* fix: Sales Order Drop Shipping Test

* fix: (translation)Multi line to single line strings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-11-12 12:23:27 +05:30
Deepesh Garg
7365566894 Merge pull request #23863 from rohitwaghchaure/incorrect-outstanding-amount-in-reverse-charge 
fix: incorrect outstanding amount for multicurrency with Reverse Charge
 2020-11-11 18:32:50 +05:30