Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,671 Commits 3 Branches 0 Tags 1 GiB
ec24afb283
Commit Graph

21855 Commits

Author SHA1 Message Date
Rohan Bansal
40611080da fix(patch): Fix edge cases for Batch 2020-04-07 17:33:10 +05:30
Rohan Bansal
56827a372c fix(patch): Reload Batch doctype before update query 2020-04-07 17:33:10 +05:30
Rohan Bansal
658ed14e40 feat(batch): Add total quantity and dashboard to Batch 2020-04-07 17:33:10 +05:30
Saqib Ansari
e9b63e45b9 chore: hide redundant base received amount 2020-04-07 17:22:11 +05:30
Rucha Mahabal
d72d9814e2
Merge branch 'develop' into healthcare_refactor 2020-04-07 16:52:22 +05:30
Rucha Mahabal
9d0ff961bc fix: patch and tests 2020-04-07 16:43:22 +05:30
Rucha Mahabal
21f5680914 fix: merge conflicts 2020-04-07 16:42:50 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix 
fix: Use separate condition for tree and normal doctype
 2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab fix: Use separate condition for tree and normal doctype 2020-04-07 15:17:06 +05:30
rohitwaghchaure
d313a239de
Merge pull request #21065 from marination/bin-requested-qty 
fix: Updated Bin Requested Qty logic
 2020-04-07 14:50:19 +05:30
Shivam Mishra
65e11a9640 refactor: razorpay subscription for memberships 2020-04-07 14:49:28 +05:30
Rohit Waghchaure
560f822dbf fix: get serial nos based on posting date and time 2020-04-07 14:42:02 +05:30
rohitwaghchaure
55ea142afd
Merge pull request #21181 from marination/purchase-receipt-scan-barcode 
feat: Scan Barcode in Purchase Receipt
 2020-04-07 14:36:56 +05:30
Marica
c732e9967d
fix: Validate Serial/Batch No naming series in Item itself (#21167) 
* fix: Validate Serial/Batch No naming series in Item itself

* fix: Consider '#' too
 2020-04-07 14:16:14 +05:30
Marica
048de30cb5
Merge branch 'develop' into pick-list-enhance 2020-04-07 14:05:05 +05:30
marination
39f9dd03a7 fix: Use reload_doc in patch 2020-04-07 14:03:50 +05:30
Deepesh Garg
d14598bc51
Merge pull request #21180 from KanchanChauhan/address-from-lead 
fix: (minor) Mandatory field missing to create address from lead
 2020-04-07 12:22:54 +05:30
Vishal Dhayagude
24e79b14e1
fix(shopping cart): UX Improvements (#21034) 
* fix: nontype error for resolved and moved place order button at bottom left

* fix: removed inline style

* fix: Request for quotation move to lower right

* fix: move buttons

Co-authored-by: Naren <patilnarendra3@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:18:47 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements (#21020) 
* feat: Date range in financial statements

* feat: Add date range filter in consolidated financial statement

* fix: Handle API changes in query_report

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:16:25 +05:30
Saqib
30fc621f1e
fix: Create Item tax template only for specific account types (#20931) 
fix: Create Item tax template only for specific account types
 2020-04-07 12:12:04 +05:30
Saqib
5bd54f544c
fix(shopping-cart): address is made mandatory to place order (#20923) 
fix(shopping-cart): address is made mandatory to place order
 2020-04-07 12:09:59 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart (#20879) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2020-04-07 12:07:01 +05:30
rohitwaghchaure
f8e8333d77
Merge pull request #21174 from rohitwaghchaure/material_request_incorrect_filter_issue_develop 
fix: material request type manufacture shows items with Is Purchase I…
 2020-04-07 12:06:18 +05:30
Deepesh Garg
4461868eff
Merge pull request #21184 from hrwX/update_modified 
fix: update modified for opportunity
 2020-04-07 10:15:41 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix 
fix: payment request status fixes
 2020-04-07 10:13:08 +05:30
Himanshu Warekar
48307513c1 fix: update modified for opportunity 2020-04-07 09:06:03 +05:30
Kanchan Chauhan
4791e313db fix: Mandatory field missing to create address from lead 2020-04-06 23:56:23 +05:30
marination
e05013ede3 feat: Scan Barcode in Purchase Receipt 2020-04-06 22:13:13 +05:30
Rucha Mahabal
0f23a304bc fix: added patch for refactored changes 2020-04-06 19:00:17 +05:30
Saqib Ansari
ca3967d52f feat: (minor) purchase register filters 2020-04-06 18:25:23 +05:30
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 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
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
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
7ecacb6360
Merge branch 'develop' into item_code_showing_as_mandatory_issue_develop 2020-04-01 10:47:33 +05:30
Deepesh Garg
5dcd2c118e
Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos 
fix: customer group price list not fetched in pos
 2020-04-01 09:42:13 +05:30
Deepesh Garg
8862be769b
Merge pull request #20809 from ronelvcabrera/billing-contact 
feat(Contacts): select billing contact for sales invoice
 2020-03-31 20:42:26 +05:30
Nabin Hait
9f6bf71b95
Merge branch 'develop' into healthcare_refactor 2020-03-31 20:31:25 +05:30
Saqib Ansari
9a7851096c fix: check if selling price exists then set it 2020-03-31 18:48:35 +05:30
Saqib Ansari
8ed7535e8a fix: travis 2020-03-31 18:44:02 +05:30
Saqib Ansari
0c8a0c9c3a fix: no server side validations for accounts in asset category 2020-03-31 18:19:31 +05:30
Poranut Chollavorn
48aa2dd94b fix(pos): fix pos display item instock 2020-03-31 18:13:55 +05:30
rohitwaghchaure
a19aa0431a
Merge pull request #20826 from saurabh6790/lead-address-fixes 
fix: if mandatory fields are missing do not create address against lead
 2020-03-31 17:38:06 +05:30
Deepesh Garg
cf9347d2f5 fix: Undo unneccessary changes 2020-03-31 17:28:43 +05:30
Deepesh Garg
5fd456baa4
Merge branch 'develop' into customer-group-price-list-in-pos 2020-03-31 16:33:41 +05:30
Deepesh Garg
bf884e8b37
Merge pull request #21092 from scmmishra/multiple-option-fix 
fix: use setup from Supplier Quotation Controller
 2020-03-31 16:28:47 +05:30
rohitwaghchaure
98a91f489d
Merge pull request #21015 from marination/so-mr-mapping-uom 
fix: UOM fixes in Sales Order,Material Request & Production Plan
 2020-03-31 16:24:37 +05:30
Deepesh Garg
d45e0e0b5b
Merge branch 'develop' into billing-contact 2020-03-31 16:06:11 +05:30
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation 
feat: allow BOM to use same item as raw material (develop)
 2020-03-31 16:04:26 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor 2020-03-31 15:59:22 +05:30
Saurabh
84b93414d0 fix: typo 2020-03-31 15:58:00 +05:30
Saurabh
6c8d63f3b9 fix: provision to setup new address from lead if address creation break due to mandatory exception 2020-03-31 15:58:00 +05:30
Saurabh
e567563aa1 fix: if mandatory fields are missing do not create address against lead 2020-03-31 15:58:00 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation 
fix: allow target warehouses to be changed for work order stock entries (develop)
 2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac (#20995) 
* fix: warehouse_account_map not getting reset for diff company transaction

* fix: potential key errors while fetching warehouse_account_map

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 15:31:15 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue 
fix: Adding proper error message
 2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups (#21070) 2020-03-31 15:28:45 +05:30
rohitwaghchaure
d274923ae1
fix: "Qty To Manufacture" field as non mandatory in job card (#21081) 2020-03-31 15:28:31 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry (#21083) 2020-03-31 15:26:45 +05:30
Deepesh Garg
242a079bcb Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-03-31 14:18:30 +05:30
Deepesh Garg
4d9fe69ba5 fix: Test cases 2020-03-31 14:17:53 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue 2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal (#21084) 
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
 2020-03-31 10:51:09 +05:30
Saqib
bba78f0384
fix: auto created asset message (#21108) 
* fix: auto created asset message

* Update erpnext/controllers/buying_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 10:49:44 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher (#21073) 
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
 2020-03-31 10:45:32 +05:30
Andy Zhu
5c54adec28
fix: docfield of sales_order is not fetching route options for new doc (#21123) 
Using the wrong method to get `so` as docfield.
frappe.meta changes will not effect the `sales_order` in `frm`.
 2020-03-31 10:43:00 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session (#20867) 
Co-authored-by: prafful1234 <prafful@mntechnique.com>
 2020-03-31 10:40:42 +05:30
Raffael Meyer
b0ab3981ea
fix(regional): header row in DATEV report (#21113) 
* fix(regional): encoding of DATEV report

* feat(regional): filter datev report by voucher type

* fix: creation time, coa used, is frozen

* add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry

* fix indentation

* fix indentation

* fix indentation
 2020-03-31 10:40:03 +05:30
Ahmad M Abdelrahman
06b3f6f781
Remove Campagin restrection (#21024) 
Lead Source Now is an independent doctype.
forcing the user to add Campaign is not valid 
Solution
Show Campaign keeping it optional and keep the user to be free to add or remove data
 2020-03-31 10:38:49 +05:30
Deepesh Garg
cc4753977f
Merge branch 'develop' into po_supplier_skip 2020-03-31 10:37:21 +05:30
Shivam Mishra
7806e5a052
feat: changes for desk pages (#21027) 
* feat: rename Chart on Getting Started Page

* feat: add dashboard and leaderboard to getting started

* feat: remove communication

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-03-31 10:30:20 +05:30
Deepesh Garg
007548b79c
fix: Bank Account patch (#21124) 2020-03-31 10:07:51 +05:30
Deepesh Garg
c014c802dd fix: Remove comments 2020-03-30 22:50:29 +05:30
Deepesh Garg
c33412b6ae feat: Link blanket order and quotation 2020-03-30 22:44:13 +05:30
Shivam Mishra
3a2c8560ba feat: update desk page for Non Profits 2020-03-30 18:15:51 +05:30
Shivam Mishra
28fafd0dda feat: setup subscription API 2020-03-30 18:15:37 +05:30
Shivam Mishra
1281634306 feat: client code to handle razorpay fields 2020-03-30 18:15:22 +05:30
Shivam Mishra
1d6395c5cf feat: add PAN details field to member for India 2020-03-30 18:14:44 +05:30
Shivam Mishra
e836cdec13 feat: update member and membership doctype 2020-03-30 18:14:10 +05:30
Shivam Mishra
1f20f6348d feat: added membership settings doctype 2020-03-30 18:13:29 +05:30
Deepesh Garg
f0760dee80 Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue 2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2 fix: Test cases 2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip 2020-03-30 13:07:03 +05:30
Deepesh Garg
647529651d
Merge pull request #21067 from Alchez/dev-add-issue-status-filter 
feat: add status filter in issue web form (develop)
 2020-03-30 12:23:20 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop 
fix: not able to add equity account in the chart of accounts
 2020-03-30 12:15:01 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev 
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
 2020-03-29 21:55:25 +05:30
Deepesh Garg
fe1f754d83
Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink 
chore: hyperlinks in cannot cancel message
 2020-03-29 21:53:43 +05:30
Deepesh Garg
e0a4a32460
Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix 
fix: cannot view report for course doctype - permission problem
 2020-03-29 21:51:15 +05:30
Rohit Waghchaure
cdf80eb4ad fix: not able to add equity account in the chart of accounts 2020-03-29 16:35:10 +05:30
Saqib Ansari
0f6d372182 fix: cannot view report for course doctype - permission problem 2020-03-29 12:52:16 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix 
fix: total currency formatting in Acc Receivable and Payable
 2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed 2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message 2020-03-28 21:17:58 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter 
chore: [ux] filter warehouse based on company
 2020-03-28 21:09:46 +05:30
Saqib Ansari
b345fe0fe9 chore: hyperlinks in cannot cancel message 2020-03-28 20:11:26 +05:30
Saqib Ansari
ed3553f795 chore: [ux] filter warehouse based on company 2020-03-28 19:12:59 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix 
fix: currency formatting in gl entry dr cr field
 2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1 fix: currency formatting in gl entry dr cr field 2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6 fix: payment request status fixes 2020-03-28 16:11:23 +05:30
rohitwaghchaure
2d5addafa7
Merge pull request #21099 from anupamvs/item-wise-sales-history-billed-amount-bug 
bug: Item-wise Sales History - Billed amount
 2020-03-28 15:05:41 +05:30
Rohit Waghchaure
e7c4565483 fix: item code showing as mandatory even if the 'Item Naming By' is set as Naming Series in stock settings 2020-03-28 14:59:00 +05:30
Anupam K
85aae7de0b bug: Item-wise Sales History - Billed amount 2020-03-28 14:13:58 +05:30
Saqib Ansari
8488ef8eb1 fix: customer group price list not fetched in pos 2020-03-28 14:07:09 +05:30
Deepesh Garg
c12a8040ef
Merge branch 'develop' into item_defaults_fix_dev 2020-03-27 21:51:00 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix 2020-03-27 21:39:16 +05:30
Shivam Mishra
71fb8e8b57 fix: use setup from Supplier Quotation Controller 2020-03-27 20:47:04 +05:30
Nabin Hait
fe000e20e8 fix: Add item defaults based on global settings only if default company and warehouse is mentioned 2020-03-27 19:24:47 +05:30
Shivam Mishra
cf6a814328 fix: total currency formatting 2020-03-27 19:15:59 +05:30
Deepesh Garg
c5f40d9072
Merge branch 'develop' into sahil28297-patch-1 2020-03-27 18:43:13 +05:30
rohitwaghchaure
0fc8b2af60
Merge pull request #21077 from rohitwaghchaure/default_item_is_not_coming_while_making_new_bom_develop 
fix: item not showing in popup while making batch
 2020-03-27 13:49:23 +05:30
Rohit Waghchaure
a5357c2e27 fix: item not showing in popup while making batch 2020-03-27 12:59:02 +05:30
Deepesh Garg
3a639ea187
Merge branch 'develop' into demo-fixed-asset-fix 2020-03-27 11:31:53 +05:30
Rucha Mahabal
cdf7189c29 fix: remove Expired status from Appointment 2020-03-27 11:30:00 +05:30
Deepesh Garg
88898abe6c fix: Randomly failing loan repayment test 2020-03-27 10:27:15 +05:30
Rucha Mahabal
197165ff40 fix: codacy 2020-03-26 17:29:50 +05:30
Rohan Bansal
da54719b43 feat: add status filter in issue web form 2020-03-26 16:08:03 +05:30
Rucha Mahabal
42376705ab fix: don't append year if values have same year in Appointment Analytics 2020-03-26 16:02:53 +05:30
Anupam K
7ca28fdab5 fix: Adding proper error message 2020-03-26 15:54:15 +05:30
marination
815c36a4eb fix: Updated Bin Requested Qty logic 2020-03-26 15:46:27 +05:30
Rohan
ea182051d3 fix: consumed qty values in work order 2020-03-26 15:32:01 +05:30
Rucha Mahabal
2cec6bd789 fix: check new patient before creating fee validity 2020-03-26 14:38:12 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger (#21021) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-26 13:37:40 +05:30
Marica
38cba153b5
fix: Make shelf life mandatory in Batched Item if it has expiry date (#21044) 2020-03-26 13:29:02 +05:30
Raffael Meyer
89cac5af16
fix(regional): encoding of DATEV report (#21059) 2020-03-26 13:25:58 +05:30
Marica
b856aae651
fix: Project field in Stock Entry Detail should be editable (#20999) 2020-03-26 13:23:49 +05:30
Saqib
74864b3b61
fix: currency not fetched on quotation creation (#20996) 2020-03-26 13:20:31 +05:30
Saqib
faea85451f
feat: auto set batch no on serial no selection (#20757) 
* feat: auto set batch no on serial no selection

* fix: dialog not shown if set warehouse selected

* fix: typo

* fix: merge conflict

* fix: callback no getting called after serial no selected

* fix: available batch qty not fetched without set_warehouse selected

* fix: item batch not synced with dialog batch table
 2020-03-26 13:18:57 +05:30
Nabin Hait
1aa8c2ecc4 fix: delete contact email and phone along with contact 2020-03-26 13:15:31 +05:30
Nabin Hait
ced6898fd7 fix: Ignored user permission for parent_company and existing_company field in Company 2020-03-26 12:30:29 +05:30
Deepesh Garg
5fbada75fa
Merge pull request #21038 from anupamvs/error-message-changes 
fix: add better error message
 2020-03-26 11:56:34 +05:30
Deepesh Garg
9062ce5191
fix: Spacing and indentations 2020-03-26 11:56:03 +05:30
Anupam K
9725e43eed fix: Adding proper error message 2020-03-26 00:17:09 +05:30
Deepesh Garg
bdcfab3a0f fix: Update patch and bank form cleanup 2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79 Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop 2020-03-25 21:00:25 +05:30
Anupam K
10b7a51805 Better error message 2020-03-25 18:21:42 +05:30
Deepesh Garg
113c6c86b7 fix: Remove debug 2020-03-25 16:54:17 +05:30
Deepesh Garg
878e4fbcf8 fix: Place of supply validation in GSTR-1 report 2020-03-25 16:52:07 +05:30
Rucha Mahabal
b60979cfaa fix: show Change Item Code button only if Unit Type is billable 2020-03-25 02:10:33 +05:30
Rucha Mahabal
1900a62c54 fix: Merge branch 'develop' into healthcare_refactor 2020-03-25 02:08:42 +05:30
rohitwaghchaure
b6bb56e9bf
Merge pull request #21037 from rohitwaghchaure/fixed_batch_selector_popup_develop 
fix: batch selection popup not coming for stock entry
 2020-03-24 16:32:21 +05:30
Deepesh Garg
da6fb435dd
Merge pull request #21041 from deepeshgarg007/default_dimension_clean_up 
fix: Default dimension set code cleanup
 2020-03-24 15:47:51 +05:30
Deepesh Garg
4e3fbf5a8b fix: Default dimension set code cleanup 2020-03-24 15:43:21 +05:30
Anupam K
b14085eb0e Better error message 2020-03-24 12:17:28 +05:30
Rucha Mahabal
60e558a019 test: Patient Medical Record 2020-03-24 11:54:35 +05:30
Rucha Mahabal
aabcee4f8f test: Healthcare Consultation DocTypes 2020-03-24 11:54:15 +05:30
Anupam K
95e35f9e81 Better error message 2020-03-24 11:52:34 +05:30
Rohit Waghchaure
5c1404e878 fix: batch selection popup not coming for stock entry 2020-03-24 11:40:03 +05:30
Rohan
7ea79933b3
fix: handle error handling (#20815) 2020-03-23 14:54:33 +05:30
Rohan
879c6bfb44
Merge branch 'develop' into dev-stock-entry-fg-validation 2020-03-23 14:50:02 +05:30
sahil28297
39f02da45a
Merge branch 'develop' into sahil28297-patch-1 2020-03-23 13:03:30 +05:30
Rucha Mahabal
f67afe67ab test: Healthcare Masters 2020-03-23 12:31:13 +05:30
Rucha Mahabal
4f9a1471e4 fix: tests 2020-03-23 10:40:39 +05:30
Deepesh Garg
96297f73f2
Merge pull request #21025 from deepeshgarg007/dimension_perm 
fix: Remove quick entry from accounting dimensions
 2020-03-22 21:56:34 +05:30
Deepesh Garg
75225316f0 fix: Remove quick entry from accouting dimensions 2020-03-22 21:50:22 +05:30
Deepesh Garg
f8b54bd301
Merge pull request #21005 from rohitwaghchaure/qty_must_be_positive_for_stock_entry_develop 
fix: stock entry qty must be positive
 2020-03-21 20:46:10 +05:30
Rohan
b7d84725e8 fix: add warehouse check for FG item 2020-03-20 18:49:11 +05:30
Rohan
4464a591ef fix: allow BOM to use same item as raw material 2020-03-20 18:49:08 +05:30
marination
73c8d23a79 fix: UOM fixes in Sales Order,Material Request & Production Plan 2020-03-20 17:52:28 +05:30