Sahil Khan
fda7cbeca4
Merge branch 'v12-pre-release' into version-12
2020-02-28 15:06:03 +05:30
Sahil Khan
2fc58b3327
bumped to version 12.5.2
2020-02-28 15:26:03 +05:50
Deepesh Garg
0cee807dfb
Merge pull request #20766 from deepeshgarg007/bank_reco_release
...
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-28 12:35:06 +05:30
Deepesh Garg
a51c56c4b3
fix: Remove debug statement
2020-02-28 12:32:18 +05:30
Deepesh Garg
d2f26e57d2
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-28 12:32:05 +05:30
Deepesh Garg
b7790c0394
fix: Item Wise report query fix ( #20765 )
2020-02-28 12:30:29 +05:30
Sahil Khan
2a1e9b542e
Merge branch 'v12-pre-release' into version-12
2020-02-26 18:20:16 +05:30
Sahil Khan
8f458feafc
bumped to version 12.5.1
2020-02-26 18:40:16 +05:50
Deepesh Garg
e116d8f819
Merge pull request #20738 from deepeshgarg007/bank_reco_fix_v12_pre
...
fix: Mandatory bank account error fix
2020-02-26 17:42:14 +05:30
Deepesh Garg
f3674ccc6c
fix: SQL condition
2020-02-26 17:40:13 +05:30
Deepesh Garg
6f35a63f2d
fix: Mandatory bank account error fix
2020-02-26 17:40:04 +05:30
Sahil Khan
b26fd04843
Merge branch 'v12-pre-release' into version-12
2020-02-20 18:26:58 +05:30
Sahil Khan
1b78d20d3c
bumped to version 12.5.0
2020-02-20 18:46:57 +05:50
sahil28297
b203406d4c
fix: proper release note version
2020-02-20 18:20:33 +05:30
Saqib
8903258362
fix: mandatory on hold comment for purchase invoice ( #20668 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2020-02-20 12:30:35 +05:30
Saqib
2d2aa7d664
fix: check for available stock in product bundle's website warehouse ( #20679 )
...
* fix: check for available stock in product bundle's website warehouse
* test: earned leaves creation
* fix: minor change
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com >
2020-02-20 12:22:01 +05:30
Nabin Hait
cd6b60df70
core: Added change log
2020-02-20 12:18:21 +05:30
Nabin Hait
b18790f5c2
Merge branch 'version-12-hotfix' into v12-pre-release
2020-02-19 19:19:36 +05:30
Mangesh-Khairnar
f6d7090f07
fix: earned leaves creation for zero maximum leaves ( #20677 )
2020-02-19 19:16:40 +05:30
Deepesh Garg
017d280877
Merge pull request #20664 from marination/stock-settings-query-v12-hotfix
...
fix: Set Query on warehouse fields in Stock Settings
2020-02-19 18:58:46 +05:30
marination
0119d15adb
fix: Server side validation for Warehouses
2020-02-19 11:21:55 +05:30
Deepesh Garg
df6cb3c43b
Merge pull request #20633 from scmmishra/tree-fix-qms
...
fix: filters for quality_procedure tree
2020-02-19 09:40:52 +05:30
marination
1ed737cf64
fix: Set Query on warehouse fields in Stock Settings
2020-02-18 21:45:52 +05:30
Deepesh Garg
c64e46fe67
Merge pull request #20483 from racitup/plaid-20343-fix
...
fix: Plaid fixes and enhancements
2020-02-18 18:03:16 +05:30
Nabin Hait
f579b0e3de
fix: merge conflict
2020-02-18 17:49:20 +05:30
Deepesh Garg
b63c041aa4
feat: Group by AR/AP report ( #20574 )
...
* feat: Group by AR/AP report
* fix: Do not consider total row in charts
* fix: Subtotal row for last party
2020-02-18 16:09:37 +05:30
rohitwaghchaure
22f9a5f09f
Merge pull request #20639 from nextchamp-saqib/pos-mode-of-pay-fix-v12
...
fix: disabled mode of payments fetches in sales invoices
2020-02-18 12:38:14 +05:30
rohitwaghchaure
e47875340e
Merge pull request #20655 from marination/precision-mr-item-hotfix
...
fix: Stock Quantity not calculated on client side in Material Request…
2020-02-18 12:34:27 +05:30
marination
6f28383531
fix: Stock Quantity not calculated on client side in Material Request Items.
2020-02-18 11:08:16 +05:30
Deepesh Garg
95050702f1
Merge branch veersion-12-hotfix into plaid-20343-fix
2020-02-17 22:11:14 +05:30
Deepesh Garg
ae8f717fe5
Merge pull request #20640 from gavindsouza/updated-requirements
...
chore(requirements): Pin requirements
2020-02-17 22:05:26 +05:30
Gavin D'souza
f95ac99baa
fix(travis): add lib cups for updated frappe requirements
2020-02-17 16:52:27 +05:30
Shivam Mishra
660b4d1e2f
feat: show numeric values in item configurator ( #20430 )
2020-02-17 15:58:31 +05:30
thefalconx33
5bfebaf1c0
fix: disabled mode of payments fetches in sales invoices
2020-02-17 14:16:49 +05:30
Deepesh Garg
980e54c5f4
Merge pull request #20570 from Er-Naren719/hotfix-user-table-columns-updated
...
feat: columns under user table updated
2020-02-17 11:19:23 +05:30
Shivam Mishra
efbfeb2d89
fix: filters for quality_procedure tree
2020-02-17 10:50:05 +05:30
rohitwaghchaure
0676ed08b1
Merge pull request #20540 from rohitwaghchaure/fixed_purchase_receipt_time_out_error
...
fix: time out error while submitting the purchase receipt
2020-02-11 19:55:04 +05:30
rohitwaghchaure
e9946672e0
Merge branch 'version-12-hotfix' into fixed_purchase_receipt_time_out_error
2020-02-11 19:54:54 +05:30
rohitwaghchaure
6124f83e6e
Merge pull request #20556 from ashish-greycube/patch-3
...
fix: backflush raw material based on - Material Transferred for Manufacture
2020-02-11 19:50:09 +05:30
Deepesh Garg
2b83debc72
Merge pull request #20564 from govindsmenokee/patch-4
...
fix: get_students not respecting the program
2020-02-11 17:03:24 +05:30
Er-Naren719
fc4cc9ab42
feat: column width increased for view attachments field ( #314 )
2020-02-11 10:17:34 +00:00
Deepesh Garg
cd19974d7a
Merge pull request #20566 from vishdha/filter_serial_based_on_batch_v12
...
fix: filter serial no based on batch no
2020-02-11 13:44:54 +05:30
vishal
cde48a44cf
fix: filter serial no based on batch no
2020-02-11 12:39:49 +05:30
Govind S Menokee
57d33f9ce6
fix: get_students not respecting the program
...
The get_students function is not taking into account the program for which the fee needs to be created. If a student is enrolled for multiple programs then the fee schedule pull up the wrong count of students.
2020-02-11 11:23:16 +05:30
Deepesh Garg
90a46acc0d
Merge pull request #20557 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue
...
fix: added indexing on columns to fix performace issue
2020-02-11 10:13:24 +05:30
Deepesh Garg
60634cc829
Merge pull request #20252 from deepeshgarg007/group_by_sales_v12
...
feat: Group by item wise sales register
2020-02-10 22:20:21 +05:30
Rohit Waghchaure
a7c27596bb
fix: added indexing on columns to fix performace issue
2020-02-10 15:30:22 +05:30
Deepesh Garg
b4e3146665
Merge pull request #20550 from nextchamp-saqib/so-update-items-warehouse-fix-v12
...
fix: mandatory warehouse wrror while updating items after submission
2020-02-10 12:09:38 +05:30
Ashish Shah
495ab6c7f2
fix: backflush raw material based on - Material Transferred for Manufacture
...
Hi @nabinhait ,
Issue : Manufacturing setting > Backflush Raw Material Based on “Material Transferred for Manufacture” doesn't fetch the actual raw material transferred qty. It fetches qty based on "BOM"
The issue is because @creamdory in PR #https://github.com/frappe/erpnext/pull/13384
commit : https://github.com/frappe/erpnext/pull/13384/files#diff-91f0ed661ef4b6e1f167fc7961b1a79b
```
changed from: if trans_qty and manufacturing_qty >= (produced_qty + flt(self.fg_completed_qty)):
to : if trans_qty and manufacturing_qty > (produced_qty + flt(self.fg_completed_qty)):
```
**'='** was added by her in the condition, which was not there before her commit.
Kindly except the fix for the issue.
https://github.com/frappe/erpnext/blob/develop/erpnext/stock/doctype/stock_entry/stock_entry.py#L1057
https://github.com/frappe/erpnext/pull/13384
https://github.com/frappe/erpnext/pull/13384/files#diff-91f0ed661ef4b6e1f167fc7961b1a79b
**before fix gif** : Stock Entry = Manufacture shows raw material quantity as per BOM.
**after fix gi**f : Stock Entry = "Manufacture" shows raw material quantity as per "Material Transfer for Manufacture".
2020-02-10 11:13:27 +05:30
Deepesh Garg
0e396a62b1
Merge pull request #20554 from ruchamahabal/fix_regional_data_v12
...
fix: patch for creating irs_1099 custom field (United States)
2020-02-10 09:08:55 +05:30
