Commit Graph

30776 Commits

Author SHA1 Message Date
Rohit Waghchaure
5317907e15 fix: material request type manufacture shows items with Is Purchase Item enabled 2020-04-06 17:53:16 +05:30
marination
642f19d704 fix: Patch fix 2020-04-06 16:01:50 +05:30
Marica
e58d1b1b9f
Merge branch 'develop' into bin-requested-qty 2020-04-06 15:54:51 +05:30
Shivam Mishra
8d6cded07f feat: added subscription web hook 2020-04-06 15:01:30 +05:30
Shivam Mishra
d92b7ab258 fix: use false explicitly 2020-04-06 14:44:33 +05:30
Shivam Mishra
4b667160a0 feat: added razorpay details to membership 2020-04-06 14:44:17 +05:30
Saqib
046b69d427
Merge branch 'develop' into item_tax_template_fix 2020-04-06 14:32:45 +05:30
Saqib
0f7ef139dc
Merge branch 'develop' into cart-address-update-v13 2020-04-06 14:23:51 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements (#20876)
* feat: Add report summary API for Balance Sheet  and PL report

* fix: Add summary cards in Cash flow report

* feat: Add report summary in consolidated financial statements

* fix: Remove accumulated values filter from P&L and cashflow report

* fix: set company default currency in profit and loss statement if no data

Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-06 14:07:20 +05:30
Deepesh Garg
8853850fd8
Merge branch 'develop' into item_tax_template_fix 2020-04-06 13:13:37 +05:30
Deepesh Garg
c01ec7606d
fix: Currency validation for default company accounts (#21094)
* fix: Currency validation for default company accounts

* fix: Improve message
2020-04-06 12:43:07 +05:30
Saqib Ansari
474222074b fix: tests 2020-04-06 12:40:41 +05:30
Saqib Ansari
4de2416806 fix: change request status on payment entry cancel 2020-04-06 12:34:38 +05:30
Marica
b37f0bb052
Merge pull request #20864 from deepeshgarg007/po_supplier_skip
feat: Allow PI creation without PO
2020-04-06 12:15:42 +05:30
Himanshu
5bb42f5564
Merge pull request #19934 from hrwX/custom_append_to
feat(Emaill Account): Email Append To
2020-04-06 11:36:38 +05:30
Himanshu Warekar
c207c457a5 Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-04-06 11:34:27 +05:30
Deepesh Garg
aa775f87b2
fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer (#21142)
* fix: Setting to toggle customer and supplier warehouse for inter warehouse transfer

* fix: Use cint
2020-04-06 10:23:06 +05:30
Deepesh Garg
1958749382
fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype (#21147)
* fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype

* fix: Codacy
2020-04-06 10:21:50 +05:30
rohitwaghchaure
05ac7213b3
fix: allow to make BOM against template item (#21146)
* fix: allow to make BOM against template item

* Update queries.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-06 10:17:57 +05:30
Nabin Hait
75ef458b34
fix: update attendace from leave application (#21155) 2020-04-06 10:15:38 +05:30
Deepesh Garg
0268c553a3
Merge pull request #21163 from deepeshgarg007/gst_3b_user_perm
fix: User permissions in GSTR 3B report
2020-04-04 21:48:23 +05:30
Deepesh Garg
6c8efdef09 fix: User permissions in GSTR 3B report 2020-04-04 20:05:17 +05:30
Saqib
63bdf5dc74
fix: [ux] credit to & debit to error message (#21132)
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 19:35:55 +05:30
Marica
f55c9c8d8c
Merge branch 'develop' into po_supplier_skip 2020-04-03 18:35:48 +05:30
marination
2a9a5352bb fix: Test Cases and block expense on outward entry
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
marination
fd04e96bdd fix: Mapping Customer Provided Material Request to Stock Entry
- Fixed inability to map Material Request to Stock Entry
- Commonified Customer Provided Item validation
2020-04-03 15:46:48 +05:30
Saqib
e2c355f670
Merge branch 'develop' into payment-req-status-fix 2020-04-03 11:29:15 +05:30
Deepesh Garg
fc0bd2a9e4
Merge pull request #21150 from scmmishra/fix-patch-dashboard
fix (tests): module import error for Dashboard Chart Field
2020-04-03 11:04:51 +05:30
Shivam Mishra
3251e1304c
fix: lms quiz type error (#21152) 2020-04-03 10:08:19 +05:30
Marica
66c4a08703
fix: Update Received Qty in Material Request as per Stock UOM (#21054)
* fix: Update Received Qty in Material Request as per Stock UOM

* fix: Process each PR only once

* fix: minor suggested changes

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 10:07:06 +05:30
Saqib
438e0433a3
fix: cannot set warehouse on deleting all so items and updating them (#21078)
* fix: cannot set warehouse on deleting all so items and updating them

* fix: travis

* fix: docname is editable in update items dialog
2020-04-03 10:02:56 +05:30
Marica
13712c45e0
Merge pull request #21122 from deepeshgarg007/quotation_blanket_order
feat: Link blanket order and quotation
2020-04-03 00:20:17 +05:30
Deepesh Garg
0f25a40421 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-04-02 21:30:53 +05:30
Deepesh Garg
d29dd58e89 fix: Validation 2020-04-02 21:29:59 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip 2020-04-02 21:17:52 +05:30
Deepesh Garg
13dbc4a415
Merge branch 'develop' into fix-patch-dashboard 2020-04-02 20:24:23 +05:30
Deepesh Garg
7b8660140d
Merge pull request #21148 from deepeshgarg007/travis_company_fixtures
fix: Travis
2020-04-02 20:22:39 +05:30
Shivam Mishra
03a1e31195
Merge branch 'develop' into fix-patch-dashboard 2020-04-02 20:00:11 +05:30
Shivam Mishra
d9a17a9be1 fix (tests): reload doctype 2020-04-02 19:57:11 +05:30
marination
9a39bcd031 fix: Fixed Test Cases for Material Request
- Reduce quantity on Material Transfer/Issue
- No effect on Customer Provided Material Request
2020-04-02 19:36:21 +05:30
Rucha Mahabal
ced978e192 fix: code clean up, performance improvements 2020-04-02 18:45:53 +05:30
Deepesh Garg
872fcb6cae fix: Travis 2020-04-02 18:11:46 +05:30
marination
686a09620d fix: Commonified code and added server side validation 2020-04-02 13:51:25 +05:30
rohitwaghchaure
e4fecd725d
Merge pull request #21144 from anupamvs/year-sum-fix
Sum of years not needed.
2020-04-02 12:01:17 +05:30
Anupam K
b20dbff726 Sum of years not needed. 2020-04-02 11:37:44 +05:30
Deepesh Garg
625acab057 fix: Add duplicate item validation 2020-04-02 11:18:22 +05:30
Anupam K
e48bcb30e7 Sum of years not needed. 2020-04-02 01:04:01 +05:30
Deepesh Garg
94a505d31c
Merge pull request #21135 from marination/stock-ledger-typo
fix: Typo in stock level validation in Stock Ledger
2020-04-01 11:20:32 +05:30
marination
6f0dc8257c fix: Typo in stock level validation in Stock Ledger 2020-04-01 11:04:14 +05:30
Marica
2c805ef951
Merge pull request #21098 from rohitwaghchaure/item_code_showing_as_mandatory_issue_develop
fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings
2020-04-01 10:54:43 +05:30