Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,732 Commits 3 Branches 0 Tags 1 GiB
805ac4ffdf
Commit Graph

36732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
21b58ef045 fix: semgrep error 2021-06-20 15:27:04 +05:30
Rohit Waghchaure
7b7ceaadd9 feat: subcontract code refactor and enhancement 2021-06-20 15:27:01 +05:30
Rohit Waghchaure
9e616b09a2 fix: material request and supplier quotation not linked if sq created from supplier portal against rfq 2021-06-20 15:17:20 +05:30
rohitwaghchaure
1c846c5be7
Merge pull request #26114 from rohitwaghchaure/fixed-stock-entry-submission-performance-v13-hotfix 
fix: time out while submitting the stock transactions with more than 50 Items
 2021-06-19 18:51:47 +05:30
Rohit Waghchaure
4d81d45a0e fix: time out while submitting the stock transactions with more than 50 items 2021-06-19 16:15:08 +05:30
Deepesh Garg
52992b345f
Merge pull request #26106 from deepeshgarg007/loan_repay_via_salary 
fix: Sanctioned loan amount limit check
 2021-06-18 23:30:54 +05:30
Deepesh Garg
22e75725ea fix: Sanctioned loan amount limit check 2021-06-18 17:25:37 +05:30
Ankush
4e88dcf956
fix: auto unlink warehouse from item on delete (#26073) (#26101) 
* fix: auto unlink warehouse from item on delete

* fix: sider

* refactor: use delete_doc

* test: add test for unlinking warehouse from item

* refactor: add msgprint to inform user of unlink

* refactor: cleanup and reuse extant functions

* fix: don't delete row, update table

Co-authored-by: Alan <2.alan.tom@gmail.com>
 2021-06-18 14:48:30 +05:30
Ankush
584fe32900
fix: escaped warehouse value for sql query (bp #26049) 
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
 2021-06-18 14:47:30 +05:30
rohitwaghchaure
e43df63978
Merge pull request #26099 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco-develop 
fix: timeout while cancelling stock reconciliation
 2021-06-18 11:31:00 +05:30
Saqib
5633834ef7
Merge branch 'develop' into export-round-off-fix 2021-06-18 11:25:21 +05:30
Saqib
cceabff6e1
Merge branch 'develop' into pr-item-gl-fix 2021-06-18 11:24:54 +05:30
Rohit Waghchaure
7fc50ba460 fix: timeout while cancelling stock reconciliation 2021-06-18 10:45:53 +05:30
Suraj Shetty
6894cc2832
Merge pull request #26088 from surajshetty3416/refactor-website-routing 2021-06-17 20:43:23 +05:30
Suraj Shetty
e8e4841e5e ci: Build frappe assets 
- Build frappe assets since it is used for print views
 2021-06-17 20:23:18 +05:30
Deepesh Garg
1c1e25da45
Merge pull request #25896 from buff0k/patch-3 
fix: Correct South Africa VAT Rate
 2021-06-17 18:27:00 +05:30
Deepesh Garg
ceb9d9e870
Merge branch 'develop' into patch-3 2021-06-17 18:26:42 +05:30
Deepesh Garg
1c58d79142
Merge pull request #26077 from nemesis189/fixed-label-rate-of-purchase-invoice-item 
fix: removed extra space from label rate
 2021-06-17 17:18:52 +05:30
Saqib Ansari
61675f1a43 fix: purchase receipt gl entries with same item code 2021-06-17 13:05:43 +05:30
Suraj Shetty
00332d1834 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-17 09:47:16 +05:30
Subin Tom
c03a947e98 fix: removed extra space from label rate 2021-06-16 19:47:55 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
Afshan
d5c172590f
fix(pos): pos loyalty card alignment (#26050) 2021-06-16 14:28:03 +05:30
Ankush
fd84847f2b
fix: syntax fixes for native class (#26064) 2021-06-16 11:14:40 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Nabin Hait
a97556fa8d Merge branch 'version-13-pre-release' into version-13 2021-06-15 19:58:40 +05:30
Nabin Hait
24a88f6cf6 bumped to version 13.5.0 2021-06-15 20:18:40 +05:50
Nabin Hait
1e2df2c109 fix(pos): 'NoneType' object is not iterable 2021-06-15 19:53:57 +05:30
Nabin Hait
b2f2d0e749 chore: Added change log for v13.5.0 2021-06-15 19:44:06 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13 
fix(India): Taxable value for invoices with additional discount
 2021-06-15 12:05:16 +05:30
Deepesh Garg
433815daba fix: Update einvoice json test 2021-06-14 20:43:51 +05:30
Deepesh Garg
4afda3c89c fix(India): Taxable value for invoices with additional discount 2021-06-14 20:43:42 +05:30
Deepesh Garg
a717b5ad6e
Merge pull request #26055 from deepeshgarg007/payment_entry_auto_tax_fixes_pre_release 
fix: Auto tax calculations in Payment Entry
 2021-06-14 20:39:52 +05:30
Deepesh Garg
bbf6121bb5 fix: Revert unintended changes 2021-06-14 20:09:31 +05:30
Deepesh Garg
ac52daa14f fix: Import throw 2021-06-14 20:09:23 +05:30
Deepesh Garg
5ef9a62917 fix: Add separate function to validate payment entry taxes 2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160 fix: Auto tax calculations in Payment Entry 2021-06-14 20:09:10 +05:30
Saqib
80077d215f
fix: patch for adding doctype to sla (#26053) 2021-06-14 19:34:25 +05:30
Himanshu
ec25d5938b
feat(SLA): Apply SLA to any document (#22449) 2021-06-14 19:05:52 +05:30
Marica
326a2e6a99
Merge pull request #26020 from marination/subcontracted-rm-to-transfer-report-develop 
fix: Report Subcontracted Raw Materials to be Transferred
 2021-06-14 17:11:51 +05:30
Marica
ff1360a8e6
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-14 16:48:57 +05:30
marination
5d082b05a9 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 16:31:45 +05:30
Nabin Hait
580b4d50b5
Merge pull request #26027 from ruchamahabal/add-inactive-status-to-employee 
feat: add Inactive status to Employee
 2021-06-14 12:34:33 +05:30
Nabin Hait
c8ed863454
Merge pull request #26029 from ruchamahabal/add-inactive-status-to-employee-v13-release 
feat: add Inactive status to Employee
 2021-06-14 12:32:28 +05:30
Suraj Shetty
d1902dfadb Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-06-14 12:25:49 +05:30
Marica
d37912fff1
Merge branch 'develop' into subcontracted-rm-to-transfer-report-develop 2021-06-12 16:00:14 +05:30
Rucha Mahabal
0ed33aa4e8
fix: unable to enter score in Assessment Result details grid (#25945) 2021-06-12 13:40:58 +05:30
Rucha Mahabal
efd7d584b2 feat: add Inactive status to Employee 2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba feat: add Inactive status to Employee 2021-06-12 13:33:21 +05:30
Ankush Menat
348f04ca82
fix: syntax error in serial/batch selector (#26024) 2021-06-11 21:01:30 +05:30