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

27316 Commits

Author SHA1 Message Date
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions (#25834) 2021-06-08 17:23:44 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Sagar Vora
062e247353 test: remove unused imports 2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac fix: tests 2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62 fix: improve filter for from_date; validation for joining and relieving date 2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757 fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-08 14:43:28 +05:30
Sagar Vora
5b1e7a61b8 test: remove unused imports 2021-06-07 19:34:02 +05:30
Sagar Vora
7f5378d98a fix: tests 2021-06-07 18:40:54 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
rohitwaghchaure
cf7baeab16
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue 
fix: custom conversion factor field not mapped from job card to stock entry
 2021-06-07 11:45:44 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
7a20c3b92a fix: Ignore internal transfer inoices from GST Reports 2021-06-06 19:23:21 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Anupam
bf0528413d fix: payroll entry employee detail issue 2021-06-06 13:12:13 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 
fix(pos): multiple pos issues
 2021-06-06 11:25:29 +05:30
Saqib Ansari
3f32969bee fix(pos): broken image in item details section 2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d fix(pos): cash shortcuts not working 2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4 fix(pos): item rate precision in item selector 2021-06-06 11:07:20 +05:30
Deepesh Garg
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
barredterra
572b6df0f2 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-04 16:55:11 +02:00
gavin
203a363cd6
Merge branch 'develop' into patch-tests 2021-06-04 20:13:15 +05:30
Gavin D'souza
102afe7de1 fix: Manually link_fields from flags before rename_doc 2021-06-04 20:11:34 +05:30
Gavin D'souza
ac99c719bc Revert "fix(patch): Reload linked doctypes before renaming dt" 
This reverts commit 4e2e8daca9
because although it fixed it locally, didn't seem to do anything for erpnext CI
 2021-06-04 20:10:26 +05:30
Gavin D'souza
4e2e8daca9 fix(patch): Reload linked doctypes before renaming dt 2021-06-04 17:56:28 +05:30
Gavin D'souza
0b7da52ef1 fix(patch): Handle NULL values from fieldtype change 2021-06-04 17:07:45 +05:30
Sagar Vora
bd92b4339c perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-04 16:09:00 +05:30
Sagar Vora
5657fddb7a fix: improve filter for from_date; validation for joining and relieving date 2021-06-04 16:09:00 +05:30
Sagar Vora
e80902be8e fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-04 16:09:00 +05:30
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr

Co-authored-by: D Tim Cummings <tim@triptera.com.au>
 2021-06-04 13:09:14 +05:30
D Tim Cummings
fb3ec7ccb8
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr
 2021-06-04 11:58:45 +05:30
Gavin D'souza
8697e89441 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-04 11:49:56 +05:30
Gavin D'souza
5bf5775b43 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-04 11:49:56 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16:38 +05:30
Rucha Mahabal
3e92089200
fix: invalid 'depends_on' expression in opportunity (#25953) 2021-06-04 11:15:38 +05:30
Rohit Waghchaure
af4794b2d1 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8 2021-06-04 10:04:09 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:22 +05:30
rohitwaghchaure
cd503ce01d
Merge pull request #25938 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation-v13-pre 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:01 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
Rohit Waghchaure
8449a47048 fix: filter type for item query 2021-06-03 18:32:28 +05:30
barredterra
c99eaf106e Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-03 14:17:43 +02:00
Rohit Waghchaure
4e10ce1632 fix: timeout error in the repost item valuation 2021-06-03 16:35:59 +05:30
Rohit Waghchaure
10558344b0 fix: timeout error in the repost item valuation 2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item 
refactor: item doctype
 2021-06-03 14:23:18 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Saqib Ansari
311b378328 fix(pos): searching items with barcode or serial no 2021-06-03 12:58:53 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat 
feat: Added check box to combine items with same BOM
 2021-06-03 12:37:02 +05:30
Anoop
f899b3a633
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25921) 2021-06-03 09:24:31 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts 
feat: create Quality Inspections from account and stock documents
 2021-06-03 01:39:05 +05:30
Nabin Hait
811f607c85 Merge branch 'version-13' into develop 2021-06-02 22:14:20 +05:30
Nabin Hait
8821d71094 bumped to version 13.4.1 2021-06-02 22:34:19 +05:50
barredterra
9affcd8f54 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 17:54:02 +02:00
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item 
fix: not able to select the item code in work order
 2021-06-02 19:00:34 +05:30
Raffael Meyer
f6627550d1
fix: remove wrong tax_category 2021-06-02 15:17:00 +02:00
barredterra
3c748efae3 feat: add Item Tax Templates for german COAs "SKR03" and "SKR04" 2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae feat: set is_default for german tax templates 2021-06-02 13:20:33 +02:00
barredterra
f259bf48aa refactor: make tax category 2021-06-02 13:20:03 +02:00
barredterra
e3557ff131 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 12:17:27 +02:00
Rohan Bansal
a06ec03efc test: add test for new QI function 2021-06-02 14:55:31 +05:30
Rohit Waghchaure
5dd92934ae fix: not able to select the item code in work order 2021-06-02 14:27:24 +05:30
Rohan Bansal
11aff80dea Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-06-02 14:22:32 +05:30
Rohit Waghchaure
721b4130db fix: not able to select the item code in work order 2021-06-02 14:13:09 +05:30
Sagar Vora
eff8f6fe34
fix(Payroll): no need to set abbr specially in Salary Slip (#25877) 2021-06-01 19:57:17 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error (#25882) 
* fix: chart of accounts importer always error 

chart of accounts importer always error Parent Account Missing

* Update chart_of_accounts_importer.py
 2021-06-01 12:15:58 +05:30
Ankush Menat
2c7fac0e76
fix: reload doc for possible future schema changes (#25904) 2021-06-01 11:56:00 +05:30
Deepesh Garg
2f5885627d fix: Labeling and other fixes 2021-06-01 11:07:18 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report (#25771) 
* refactor: leave balance report

* refactor: sql to orm
 2021-06-01 10:53:00 +05:30
Ganga Manoj
c8b34798fe
fix(Delivery Note): Assign Product Bundle's conversion_factor to Packed Items (#25840) 2021-06-01 10:44:26 +05:30
rohitwaghchaure
970f00922d
Merge pull request #25898 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:35 +05:30
rohitwaghchaure
6463cbd15e
Merge pull request #25897 from anupamvs/stock-reconciliation 
fix: featching serialized items
 2021-05-31 20:00:26 +05:30
Jannat Patel
022b5c973a
fix: wrap dates in getdate for leave application (#25899) 
* fix: wrap dates in getdate for leave application

* fix: translation issue

* fix: replaced today with getdate
 2021-05-31 19:49:53 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles (#25847) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-05-31 19:49:03 +05:30
Deepesh Garg
0ea6725baa
fix: Rename Loan Management workspace to Loans (#25856) 2021-05-31 19:48:31 +05:30
Anupam
0358b64743 fix: featching serialized items 2021-05-31 15:59:32 +05:30
Eben van Deventer
7f2ae23dbf
Correct South Africa VAT Rate 
On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.
This was already done with a commit to version-13 branch under #25894, this proposed change is to ensure that the update is pulled through to future versions.
 2021-05-31 12:24:29 +02:00
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup (#25871) 2021-05-31 15:36:20 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Nabin Hait
c63e233bc7 bumped to version 13.4.0 2021-05-31 11:34:33 +05:50
Nabin Hait
4c94ccc8d8 chore: Added change log 2021-05-31 10:51:57 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount (#25868) 2021-05-31 09:56:49 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report (#25727) 
* refactor: Vehicle Expense Report

* test: Vehicle Expenses Report

* feat: Added Employee filter to report

- fix Vehicle Log form view

* fix: set currency fieldtype for chart data

- added filters for employee and vehicle

* fix: service expenses not getting set
 2021-05-31 09:11:42 +05:30
Marica
42b2ea556f
Merge pull request #25358 from noahjacob/maintenance_feat 
refactor: maintenance schedule and visit enhancements.
 2021-05-30 01:20:30 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report (#25884) 2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset 
fix(plaid): cannot reset plaid link for a bank account
 2021-05-29 20:05:25 +05:30
Deepesh Garg
d067e25dad
Merge pull request #25828 from Anuja-pawar/issue-summary-report-fix 
fix: Add Hold status column in the Issue Summary Report
 2021-05-29 19:24:15 +05:30
Deepesh Garg
c3d8115ca1
Merge pull request #25849 from nextchamp-saqib/pos-rate-as-identifier 
fix(pos): cannot add same item with different rates
 2021-05-29 17:33:11 +05:30
Deepesh Garg
5483f21fe7
Merge pull request #25872 from nextchamp-saqib/fix-pos-broken-img 
fix(pos): rendering of broken image on pos
 2021-05-29 17:28:03 +05:30
Ankush Menat
431d3295b4
fix: use dictionary filter instead of list (#25874) 
Item query doesn't support list filter anymore.
 2021-05-28 21:12:25 +05:30
Ankush Menat
2df7f474fa
fix: use dictionary filter instead of list (#25875) 
Item query doesn't support list filter anymore.
 2021-05-28 21:12:10 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Saqib Ansari
b72b4c0bf9 fix(pos): rendering of broken image on pos 2021-05-28 17:38:01 +05:30
Raffael Meyer
6038663bf8
fix: add_deduct_tax in Purchase Taxes setup (#25757) 2021-05-28 16:29:28 +05:30
Noah Jacob
6fb218e033 refactor: suggested changes 2021-05-28 16:15:50 +05:30
Saqib Ansari
05386ff12f chore: remove unwanted method 2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3 fix: reset plaid link button 2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623 fix(plaid): cannot reset plaid link for a bank account 2021-05-28 11:36:24 +05:30
noahjacob
0b02f1335f refactor: removed redundant links in test case 2021-05-28 11:04:34 +05:30
noahjacob
d071586589 refactor: removed maintenance schedule detail link 2021-05-28 10:54:35 +05:30
noahjacob
7fa045c1c9 refactor: using parent form links of maintenance schedule 2021-05-28 10:54:35 +05:30
noahjacob
3bca90dbe6 refactor: updated mapping for maintenance schedule links in maintenance visit 2021-05-28 10:54:22 +05:30
Suraj Shetty
68b050de97
Merge pull request #25863 from surajshetty3416/website-theme-fixes-version-13-hotfix 2021-05-28 10:48:23 +05:30
Ganga Manoj
17736afab5
fix(POS): Fix stock availability calculation if negative_stock_allowed is checked (#25859) 2021-05-28 10:03:41 +05:30
Ganga Manoj
8a776a63cd
fix(POS): Add Product Bundles to POS item search (#25860) 2021-05-28 09:56:30 +05:30
Suraj Shetty
f4db3139b7 refactor: Use css variables for breakpoint value 2021-05-28 09:22:46 +05:30
prssanna
c4d4be3265 fix: ensure website theme is applied correctly 2021-05-28 09:22:45 +05:30
Suraj Shetty
113a6f3d80 fix: Use frappe.safe_eval instead of eval 2021-05-28 09:10:34 +05:30
Suraj Shetty
96542c3d04 style: Fix sider issues 2021-05-28 09:10:34 +05:30
Suraj Shetty
273589e835 test: Fix a case where test used to fail due to holiday list 
- fixes: "Please set a default Holiday List for Employee EMP-00009 or Company Wind Power LLC" error
 2021-05-28 09:10:33 +05:30
Suraj Shetty
54354a84e1 test: Fix permission error 2021-05-28 09:10:33 +05:30
Suraj Shetty
d48ea663d9 test: Fix test name 
- Rename TestSubcontractedItemToBeReceived > TestSubcontractedItemToBeTransferred
 2021-05-28 09:10:33 +05:30
Suraj Shetty
d1a13ec050 test: Fix valuation rate for raw materials 2021-05-28 09:10:33 +05:30
Suraj Shetty
a891d6eed2 fix: allow_zero_valuation_rate for rejected qty 2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d test: Fix test dependency 2021-05-28 09:09:36 +05:30
Suraj Shetty
175cb27bcb test: Pass ConflictingTaxRule during tax rule test 2021-05-28 09:09:36 +05:30
Suraj Shetty
c26d41acf9 chore: Remove unnecessary print statements 2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67 test: Fix dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54 test: Fix test_dependencies 2021-05-28 09:07:57 +05:30
Suraj Shetty
34e620fb5b test: Fix dependency 2021-05-28 09:07:57 +05:30
Suraj Shetty
5f4527a6a1 refactor: Use css variables for breakpoint value 2021-05-28 08:55:38 +05:30
Deepesh Garg
a150645b57 fix: Remove GL Entry from print 2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca fix: Split GL Entry 2021-05-27 20:09:45 +05:30
barredterra
50794407b4 feat: Item Tax Templates for Germany 2021-05-27 14:17:53 +02:00
barredterra
86ee3ebb09 feat: create tax category during taxes setup 2021-05-27 14:16:26 +02:00
barredterra
46d39d27aa fix: validate company in taxes setup 2021-05-27 14:16:01 +02:00
anushka19
04dfaf3b2a fix: Broken help links fixed 2021-05-27 17:45:37 +05:30
Deepesh Garg
740c68d075 fix: Debug Test 2021-05-27 17:43:53 +05:30
noahjacob
fbc8694291 refactor: added maintenance schedule links to parent form 2021-05-27 17:37:57 +05:30
noahjacob
bd783e8072 refactor: renamed item_ref to item_reference 2021-05-27 17:34:16 +05:30
Anuja P
753e5894de fix: ageing error in PSOA 2021-05-27 17:33:22 +05:30
noahjacob
9e4c28852e refactor: added maintenance visit to maintenance schedule dashboard 2021-05-27 17:25:50 +05:30
Anuja P
bb0a40b995 fix: ageing error in PSOA 2021-05-27 17:15:47 +05:30
Deepesh Garg
ea18230274 fix: Update GL Entry ordering 2021-05-27 16:40:37 +05:30
Suraj Shetty
df680a2c62 Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-05-27 14:31:37 +05:30
Saqib Ansari
3382655b5e fix: sider issues 2021-05-27 14:27:38 +05:30
Suraj Shetty
8612558433
Merge branch 'develop' into website-theme-fixes 2021-05-27 13:56:28 +05:30
Saqib Ansari
45a89a7c67 fix(pos): cannot add same item with different rates 2021-05-27 13:49:45 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Anuja P
e2059fb9f6 fix: spaces to tabs 2021-05-26 20:07:53 +05:30
Anuja P
5e4128e70c fix: patch for existing issues 2021-05-26 20:03:14 +05:30
noahjacob
dc51388666 style: fixed indentations and formatting 2021-05-26 18:28:24 +05:30
Rohan Bansal
9857d63523 fix: add requested changes 2021-05-26 15:41:36 +05:30
Rohan Bansal
1e3a3b27c6 style: semgrep issues 2021-05-26 15:18:10 +05:30
Rohan Bansal
1cdf5a0dba fix: add requested changes 2021-05-26 14:42:15 +05:30
Rohan Bansal
c5b074269a Merge remote-tracking branch 'upstream/version-13-hotfix' into dev-quality-inspection-accounts 2021-05-26 14:32:14 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes 
fix(ux): fix unstranslated text in msgprint/throw
 2021-05-26 14:12:36 +05:30
Marica
7342eb64e9
Merge pull request #25810 from marination/se-supplier-customer 
chore: Cleanup Customer and Supplier Details section in Stock Entry
 2021-05-26 14:10:41 +05:30
Anupam Kumar
59769c7a86
fix: student invalid password reset link (#25825) 2021-05-26 12:16:04 +05:30
Anupam Kumar
349ef8274b
fix: student invalid password reset link (#25826) 2021-05-26 12:14:02 +05:30
Deepesh Garg
36a11bf9ce
Merge pull request #25841 from nextchamp-saqib/fix(gstr-1)--incorrect-gstin-fetched-incase-of-branch-company-address 
fix(gstr-1): incorrect gstin fetched incase of branch company address
 2021-05-26 11:20:30 +05:30
Marica
be157e7467
Merge branch 'version-13-hotfix' into se-supplier-customer 2021-05-26 11:19:50 +05:30
Anurag Mishra
2e0e4a7861
refactor: Additional Salary form clean up (#25785) 
* feat: additional salary clean up

* fix: Label and description

* fix: labels

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-26 11:13:19 +05:30
Anuja P
db5217e48e fix: renaming hold to on hold 2021-05-26 11:09:48 +05:30
Saqib Ansari
0e804e292a fix(gstr-1): incorrect gstin fetched incase of branch company address 2021-05-26 10:54:16 +05:30
Anuja P
f3f87886a9 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into issue-summary-report-fix 2021-05-26 10:21:46 +05:30
Deepesh Garg
5e27c7dae2 fix: Add non group filter for account 2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1 fix: Update TDS rate for test 2021-05-25 22:03:50 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Nabin Hait
e5df60287e Merge branch 'version-13-hotfix' into version-13-pre-release 2021-05-25 20:42:58 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Ganga Manoj
18cfced032
fix(Material Request): Make status on list and form view the same (#24856) 2021-05-25 19:54:07 +05:30
Nabin Hait
db95db892c fix: merge conflict 2021-05-25 19:33:23 +05:30
Ganga Manoj
99636c6aca
fix: rearrange buttons for company doctype (#25617) 2021-05-25 19:17:01 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Laurynas Sakalauskas
6a62ad325f
fix(plaid): withdrawals and deposits are recorded incorrectly (#25784) 2021-05-25 19:09:44 +05:30
Rakshith N
507a211c81
fix: fetch email id from dialog box in pos past order summary' (#25808) 2021-05-25 19:03:29 +05:30
Deepesh Garg
84f270e732 fix: Remove unwanted commits 2021-05-25 18:03:42 +05:30
noahjacob
73e41c0bd6 refactor: suggested changes 2021-05-25 18:01:47 +05:30
Deepesh Garg
55a3fb57dd fix: Linting Issues 2021-05-25 17:40:06 +05:30
Deepesh Garg
36d47f97f4 fix: Linting issues 2021-05-25 17:40:04 +05:30
Deepesh Garg
6f84cee6fe fix: Uncommentt test 2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
c9da1fc568 chore: Test case for adance TDS allocation 2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4 fix: Allocate advance taxes only for payment entry 2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67 fix: Test Cases 2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c fix: TDS report cleanup 2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613 fix: TDS against Purhase Orders 2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818 feat: Tax deduction against advance payments 2021-05-25 17:17:40 +05:30
Anuja P
3efd411ddb fix: Hold status is added in the report 2021-05-25 16:24:01 +05:30
Suraj Shetty
45bc14408e refactor: Remove redundant variables.scss import 2021-05-25 15:57:33 +05:30
Suraj Shetty
d3b9edd2c4 fix: Remove unnecessary import 2021-05-25 12:52:26 +05:30
Suraj Shetty
b14a935c5d Merge branch 'develop' of github.com:frappe/erpnext into refactor-website-routing 2021-05-25 11:02:03 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13 
fix: Ignore rounding diff while importing JV using data import
 2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice 
fix: removed serial no validation for sales invoice
 2021-05-25 10:40:46 +05:30
Suraj Shetty
2f8a742aa8 refactor: Replace render imports 2021-05-25 10:28:32 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13 
fix: Cashflow mapper not showing data
 2021-05-24 20:40:07 +05:30
Anurag Mishra
5670cf4386
feat: enhancements in Training Event (#25782) 
* feat: Some Minor fixes

* fix: patch file

* fix: patch

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-24 20:24:20 +05:30