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
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
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
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
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity ( #25955 )
2021-06-04 11:16: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
c59371ab0c
fix: filter type for item query ( #25942 )
2021-06-03 20:02:58 +05:30
barredterra
c99eaf106e
Merge branch 'version-13-hotfix' into item-tax-templates
2021-06-03 14:17:43 +02:00
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
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
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
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
Deepesh Garg
c6dcc9d94a
fix(India): Taxable value for invoices with additional discount
2021-06-01 13:13:04 +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
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
Raffael Meyer
80540d38ba
fix: add_deduct_tax in Purchase Taxes setup ( #25871 )
2021-05-31 15:36:20 +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
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
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
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
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
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
