Deepesh Garg
60b77f9865
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue
...
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 17:52:43 +05:30
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany
2020-12-29 11:58:57 +01:00
Rohit Waghchaure
81285204dc
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
rohitwaghchaure
25bc9851f0
Merge pull request #24220 from rohitwaghchaure/fixed-finished-product-qty
...
fix: finished good produced qty validation
2020-12-29 13:41:03 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes
2020-12-29 13:09:42 +05:30
Deepesh Garg
39ba31e68f
fix: Set batch values
2020-12-28 23:35:03 +05:30
Deepesh Garg
6d3e843f07
fix: Price not getting set for first row
2020-12-28 23:22:09 +05:30
Deepesh Garg
a679d43722
fix: Item Price using batch selector
2020-12-28 21:14:13 +05:30
Deepesh Garg
2466c3214a
fix: Add missing semicolon
2020-12-28 21:13:54 +05:30
Deepesh Garg
646ead65d8
fix: Sider issues
2020-12-28 21:13:43 +05:30
Deepesh Garg
7b282d253f
fix: Move item price link to batch
2020-12-28 21:13:36 +05:30
Deepesh Garg
37320074b2
fix: Sider Issues
2020-12-28 21:13:27 +05:30
Deepesh Garg
a5353c7d2d
fix: Add test case for batch pricing
2020-12-28 21:13:17 +05:30
Deepesh Garg
e85050c190
fix: Rate for items with no batch
2020-12-28 21:13:09 +05:30
Deepesh Garg
c3b22c6e5c
feat: Batch wise item pricing
2020-12-28 21:12:58 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
marination
a69e81a151
chore: Made 'Parameter' a link field in QI and QI Template
...
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
2020-12-28 18:07:22 +05:30
Deepesh Garg
73cef56df7
fix: Debug travis
2020-12-28 17:44:00 +05:30
Deepesh Garg
a0f6381d6e
fix: Debugging
2020-12-28 17:43:21 +05:30
Deepesh Garg
b7b3944cef
fix: Internal sales item link in Purchase Invoice
2020-12-28 17:43:11 +05:30
Deepesh Garg
9d4bf040e9
fix: Fixes in flow
2020-12-28 17:11:10 +05:30
Deepesh Garg
afef92a88b
fix: Add validations and other fixes
2020-12-28 17:10:53 +05:30
Deepesh Garg
a9f4508cd1
fix: Add missing set warehouse fields
2020-12-28 17:06:14 +05:30
Deepesh Garg
dac19cbca5
fix: Consider conversion factor for invoices
2020-12-28 17:05:25 +05:30
Deepesh Garg
573d9094bb
fix: Item valuation for internal stocktransfers
2020-12-28 17:05:16 +05:30
Deepesh Garg
0413e34f0d
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into enconnex_erpnext
2020-12-28 17:04:35 +05:30
marination
29a03bd5a1
feat: Add 'Manual Inspection' checkbox
...
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
2020-12-28 16:59:13 +05:30
Deepesh Garg
b75f198648
Merge pull request #24223 from frappe/revert-24087-batch-wise-pricing
...
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:42:42 +05:30
pateljannat
88471854d5
fix: sider
2020-12-28 15:40:23 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:29:30 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux
2020-12-28 15:09:15 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing
...
feat: Batch wise item selling pricing
2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc
fix: finished good produced qty validation
2020-12-28 14:08:45 +05:30
pateljannat
aa8ff81061
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-28 12:35:27 +05:30
pateljannat
71f203dbc5
fix: template task status, subject in project template task
2020-12-28 12:35:19 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter
...
fix: filter Therapy Types and Therapy Plan in Patient Appointment
2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676
Merge branch develop into batch-wise-pricing
2020-12-28 10:48:29 +05:30
Jannat Patel
c09100d738
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-28 10:20:27 +05:30
Deepesh Garg
7c300859ed
fix: Test Cases
2020-12-26 20:14:51 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset
...
fix: accounting entries of asset when submitting purchase receipt
2020-12-26 19:14:32 +05:30
Saurabh
0a4ac4583e
Merge branch 'version-13-beta-pre-release' into version-13-beta
2020-12-26 14:55:52 +05:30
Saurabh
d1d030b54a
bumped to version 13.0.0-beta.7
2020-12-26 15:15:51 +05:50
Saqib
60a1d25196
fix: cancelling of asset value adjustement ( #24193 )
2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue
...
fix: partial serial no return issue
2020-12-26 12:12:04 +05:30
Deepesh Garg
4f8da4c313
fix: Test Cases
2020-12-26 11:37:51 +05:30
Nabin Hait
af1af925ac
chore: Added change log ( #24213 )
2020-12-26 11:09:46 +05:30
