Rucha Mahabal
67519d6b79
fix: boarding status in Employee Onboarding and Separation
...
- make boarding status read-only as its dependent on project
- update boarding status in onboarding/separation on project update
- update tests to check status changes
2021-06-03 18:07:00 +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
gavin
3d5e15284b
Merge pull request #25850 from gavindsouza/rm-py2
...
fix: Add future in requirements.txt
2021-06-03 11:34:24 +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
GangaManoj
9fb47795c4
fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked
2021-06-03 04:55:49 +05:30
GangaManoj
2ceeb8138d
fix(Asset Repair): Set company when creating Stock Entry
2021-06-03 01:54:44 +05:30
GangaManoj
960840dc3a
fix(Asset Repair): Set completion_date
2021-06-03 01:53:13 +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
0385ae2b43
Merge branch 'version-13-pre-release' into version-13
2021-06-02 22:14:20 +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
Nabin Hait
830e87a4dd
Merge pull request #25917 from rohitwaghchaure/fixed-work-order-no-able-to-select-item-pre
...
fix: not able to select the item code in work order
2021-06-02 18:59:41 +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
Deepesh Garg
7c7c084159
fix: Check for tax category
2021-06-02 14:12:28 +05:30
Deepesh Garg
ca34eec2d6
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70
fix: Regional settings setup
2021-06-02 13:26:21 +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
Deepesh Garg
c6dcc9d94a
fix(India): Taxable value for invoices with additional discount
2021-06-01 13:13:04 +05:30
Rohit Waghchaure
6432aaa07a
feat: added reports to check incorrect qty and valuation for serialized items
2021-06-01 12:46:43 +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
Suraj Shetty
5b17f335d1
ci: Add coveralls_repo_token env variable
2021-06-01 08:18:56 +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
