CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-10 22:06:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,772 Commits 410 Branches 1,717 Tags
5a34e2db97aa8b37e149a4e05cee6ca92266219e
Commit Graph

30772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
5a34e2db97 Merge pull request #23403 from rohitwaghchaure/download-required-materials-not-working 
fix: Download Required Materials not working for production plan
 2020-09-23 00:56:58 +05:30
Rohit Waghchaure
b948cf204c fix: Download Required Materials not working for production plan 2020-09-22 19:47:33 +05:30
Afshan
38000aacc5 fix: warehouse address filtered based on warehouse (#23381) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-09-22 16:51:58 +05:30
rohitwaghchaure
d12c99fda9 Merge pull request #23389 from rohitwaghchaure/fixed-subcontract-issue-for-bacthed-raw-material 
fix: incorrect consumed qty if raw material with batch
 2020-09-22 11:54:46 +05:30
Rohit Waghchaure
b53a84b07f fix: incorrect consumed qty if raw material with batch 2020-09-22 10:36:52 +05:30
rohitwaghchaure
59a4150428 Merge pull request #23377 from rohitwaghchaure/online-pos-print-not-working 
fix: online pos print not working
 2020-09-22 10:29:12 +05:30
Rohit Waghchaure
088e1e66ac fix: online pos print not working 2020-09-21 18:26:52 +05:30
Mangesh-Khairnar
19365d6d07 fix(plaid): do not send null list in account ids (#23375) 2020-09-21 18:04:34 +05:30
Rohan
af585aae28 fix: use Plaid's new API (v12) (#23317) 
* fix: use Plaid's new API

* fix: requested changes
 2020-09-21 16:08:55 +05:30
rohitwaghchaure
d07579a142 Merge pull request #23367 from rohitwaghchaure/enabled-no-copy-for-bill-date 
refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation
 2020-09-21 13:46:49 +05:30
rohitwaghchaure
1b8006be5c Merge pull request #23366 from rohitwaghchaure/fix-stock-reco-with-serial-nos 
fix: stock reconciliation, incorrect serial nos fetched in the current serial no field
 2020-09-21 12:49:31 +05:30
Rohit Waghchaure
e71e4cf8b5 refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation 2020-09-21 12:26:35 +05:30
Rohit Waghchaure
f5fd2cd4a2 fix: stock reconciliation, incorrect serial nos fetched in the current serial no field 2020-09-21 01:20:00 +05:30
Deepesh Garg
a621c52ebb Merge pull request #23356 from Anurag810/accounts_recievable_v12 
fix: Cost Center filter in accounts receivable and payable report
 2020-09-20 19:35:26 +05:30
Saqib
3748cbb32c fix: depreciation start date ux fixes (#23340) 2020-09-20 19:31:46 +05:30
Anurag Mishra
d57a94e2f2 fix: No handlefor Cost centers in Accounts Receivable 2020-09-18 13:36:07 +05:30
Marica
4b2e4026c4 Merge pull request #23338 from marination/item-tax-update-items-fix 
fix: Item Tax Updating via `Update Items` in SO/PO
 2020-09-16 11:56:29 +05:30
marination
526814c041 fix: Fetch and set Item Tax Template via Update Items 2020-09-16 10:28:33 +05:30
Saqib
1ee7ea6ade fix: update items with workflow travis fix (#23335) 2020-09-15 21:58:36 +05:30
rohitwaghchaure
783a4c7f48 fix: set_taxes() missing 1 required positional argument: 'company' (#23329) 2020-09-15 19:42:56 +05:30
rohitwaghchaure
bea5e5b1bc fix: consumed qty logic for subcontracted raw materials (#23314) 
* fix: consumed qty logic for subcontracted raw materials

* added test case

* fix: sales order workflow test case
 2020-09-15 19:40:37 +05:30
Saqib
812033b782 fix: purchase order updates are not tracked (#23325) 2020-09-15 11:21:16 +05:30
rohitwaghchaure
bb905ca4b0 fix: incorrect calculation for consumed qty for subcontract item (#23257) 
* fix: incorrect calculation for consumed qty for subcontract item

* added test case
 2020-09-14 21:12:16 +05:30
Rucha Mahabal
a951a59094 fix: get_transaction_entries function arguments in Bank Statement Transaction Entry (#23052) 2020-09-14 21:05:54 +05:30
rohitwaghchaure
444f657d25 fix: production plan incorrect work order qty (#23264) 
* fix: production plan incorrect work order qty

* added test case

* Update test_production_plan.py
 2020-09-14 20:51:20 +05:30
Saqib
1e981b50d5 Update items with workflow v12 (#23324) 
* feat: validate workflow before so/po update items

* fix: incorrect workflow validation on so/po update items
 2020-09-14 19:53:52 +05:30
rohitwaghchaure
279ccc56ee Merge pull request #23320 from marination/quality-inspection-fields-fix 
fix: Make Reference fields mandatory in Quality Inspection
 2020-09-14 14:11:35 +05:30
Marica
b67996ec42 Merge branch 'version-12-hotfix' into quality-inspection-fields-fix 2020-09-14 12:01:26 +05:30
Marica
fbee0804c3 Merge pull request #23321 from marination/pr-dn-get-items-fix 
fix: Make sure Supplier/Customer is selected before fetching Items.
 2020-09-14 11:37:25 +05:30
marination
a34a490e0c fix: Make sure Supplier/Customer is selected before fetching Items. 2020-09-14 11:11:39 +05:30
marination
815416adc5 fix: Make Reference fields mandatory in Quality Inspection 2020-09-14 11:07:26 +05:30
Saqib
d409f91469 fix: asset movement date for backdated asset entry (#23300) 2020-09-09 10:53:48 +05:30
rohitwaghchaure
dad5bbdaa2 Merge pull request #23131 from Anurag810/leave_application_form_dashboard_fixes 
fix: Form dashboard showing wrong balance
 2020-09-08 16:58:11 +05:30
Anurag Mishra
e5fbebf946 fix: update filters 2020-09-08 15:55:07 +05:30
Marica
245cd21c31 Merge pull request #23295 from AfshanKhan/reverse-je-ignore-flag-v12 
fix: removed ignore permission flag
 2020-09-08 14:52:19 +05:30
Marica
4d9b511bb4 Merge branch 'version-12-hotfix' into reverse-je-ignore-flag-v12 2020-09-08 13:52:54 +05:30
Afshan
f1471ecbd4 fix: removed ignore permission flag 2020-09-08 13:50:54 +05:30
Marica
00a8e2226a Merge pull request #23292 from AfshanKhan/irs-v12 
fix: returned empty list if non US based company
 2020-09-08 13:45:44 +05:30
Afshan
d44052441b fix: returned empty list if non US based company 2020-09-08 13:03:37 +05:30
rohitwaghchaure
8e21738238 Merge pull request #23192 from marination/batch-source-reference 
fix: Unlink and delete batch created from stock reco on cancel
 2020-09-08 12:12:30 +05:30
Rucha Mahabal
5096639591 fix: Lock row in subquery while setting delivered qty (#23101) 2020-09-08 11:58:07 +05:30
rohitwaghchaure
810c4250b8 Merge pull request #23286 from rohitwaghchaure/fixed-payment-entry-status-issue 
fix: incorrect payment entry status
 2020-09-08 10:35:52 +05:30
Deepesh Garg
47c535399c fix: Check if subscription is already created for current invoicing period (#23143) 
* fix: Check if subscription is already created for current invoicing period

* fix: Test for duplicate subscription

* fix: invoice generation at the begining of period fix

* fix: invoice generation at the begining of period fix

* fix: Remove unwanted file

* fix: Generate new invoices even though current invoices are unpaid

* fix: Make invoices table read-only

* fix: Update test cases
 2020-09-08 10:30:02 +05:30
rohitwaghchaure
b06c618585 Merge pull request #23247 from Anurag810/attendance_calendar_map_v12 
fix: Attendance calendar map fix
 2020-09-08 10:15:01 +05:30
Rohit Waghchaure
785b7b3359 fix: incorrect payment entry status 2020-09-07 21:54:57 +05:30
Marica
32179293ee Merge branch 'version-12-hotfix' into batch-source-reference 2020-09-07 19:30:36 +05:30
rohitwaghchaure
8dd72018c2 Merge pull request #23262 from rohitwaghchaure/not-able-to-make-material-request-from-so 
fix: not able to make material request from SO
 2020-09-06 20:49:03 +05:30
rohitwaghchaure
b2bf54cc33 Merge pull request #23260 from anupamvs/se-quantity-v12 
fix: SE quantity data type issue
 2020-09-04 16:07:32 +05:30
Rohit Waghchaure
4f3eb3fceb fix: not able to make material request from SO 2020-09-04 15:24:56 +05:30
Anupam K
9260cf11b6 fix: SE quantity data type issue 2020-09-04 15:10:50 +05:30