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

21799 Commits

Author SHA1 Message Date
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
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
sahil28297
4c3679ba8a
fix: develop version as 12.0.0-dev 2020-03-20 15:38:52 +05:30
sahil28297
fcdc2b1815
fix: develop version as 12.0.0.dev 2020-03-20 15:20:28 +05:30
sahil28297
54cbff9e80
fix: develop version as 12.x.x instead of 12.2.0 2020-03-20 14:23:27 +05:30
Suraj Shetty
3cf0dc966c fix: Add currency in options of Opportunity Amount 
- To show currect symbol in list view
 2020-03-20 12:51:16 +05:30
Rohit Waghchaure
5e4e2dbd03 fix: stock entry qty must be positive 2020-03-19 14:53:37 +05:30
Rohan
ce90848161 fix: allow target warehouses to be changed for work order stock entries 2020-03-19 13:22:58 +05:30
Deepesh Garg
dbeb77e745
fix: Unable to submit landed cost voucher (#20977) 2020-03-19 11:03:03 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes (#20981) 2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop (#20987) 
* fix: Multiple fixes during pre-release testing

* fix: Merge conflict
 2020-03-19 10:59:32 +05:30
Deepesh Garg
9476170b09
Merge pull request #20994 from rohitwaghchaure/fixed_bom_comparision_issue_develop 
fix: bom comparison issue
 2020-03-19 10:55:14 +05:30
Rohit Waghchaure
d9469137cc fix: bom comparison issue 2020-03-19 10:07:27 +05:30
rohitwaghchaure
e4cd12506c
Merge pull request #20991 from rohitwaghchaure/fixed_reserved_qty_for_production_develop 
fix: reserved qty for production issue for partial completion of work…
 2020-03-19 09:37:43 +05:30
Deepesh Garg
6b36fae531
Merge pull request #20990 from rohitwaghchaure/fixed_shortage_qty_in_stock_projected_qty_report_develop 
fix: shortage qty in stock projected qty report
 2020-03-19 09:33:03 +05:30
Rohit Waghchaure
dd13d0a9a9 fix: reserved qty for production issue for partial completion of work order 2020-03-19 09:29:17 +05:30
Rohit Waghchaure
cd2478a527 fix: shortage qty in stock projected qty report 2020-03-19 09:27:53 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed (#20975) 2020-03-18 18:23:38 +05:30
Marica
508ed1e121
fix: Missing if condition in Customer Default Bank Account Validation. (#20969) 2020-03-18 11:28:04 +05:30
marination
3251dcf672 fix: Added patch to patches.txt 2020-03-18 10:11:23 +05:30
Rucha Mahabal
0eeaad8ce7 fix: create fee validity for new patients only 2020-03-17 20:26:29 +05:30
Rucha Mahabal
2d785b7b09 fix: invoicing logic for appointments 2020-03-17 20:18:16 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop (#20965) 
* fix: Account setting words switches to US Terminology

* created united_states.js

* Remove Unwanted Spaces

* Remove all changes

* Add spaces between arguments

Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
 2020-03-17 19:39:30 +05:30
Rucha Mahabal
f2574dde37 fix: set fee validity start date and set status as Completed or Pending 2020-03-17 19:28:18 +05:30
Rucha Mahabal
2f2c09bd98 fix: wrong fee validity calculation and payment fields visibility in appointment 2020-03-17 18:10:39 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups 
fix(accounts): adjust account groups in SKR04
 2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis (#20924) 
* fix: Multiple fixes for travis

* fix: Multiple fixes for travis

* fix: Run dashboard patch if table already exists

* fix: Multiple fixes for travis

* fix: deletion of auto-created batch
 2020-03-17 17:04:18 +05:30
rohitwaghchaure
06dc6a527e
fix: bom replace tool issue (#20842) 2020-03-17 17:01:26 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts (#20913) 
* fix: Party name in Statement Of Accounts

* Update general_ledger.html

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 17:00:06 +05:30
marination
e1f499ae1b fix: Pick List Enhancements 2020-03-17 11:47:11 +05:30
Deepesh Garg
e7aefc1163 fix: Add check to skip PR in supplier master 2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37 fix: Add check to skip SO and DN in customer master 2020-03-17 11:43:34 +05:30
Marica
b10adbb161
fix: Item alternative must have similar fields as original item (#20796) 
* fix: Item alternative must have similar fields as orignal item

* fix: Using db.get_values and meta instead of get_value and get_doc

* fix: Made code more DRY

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-17 10:56:59 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension (#20860) 
* feat: Nested set filtering for accounting dimension

* fix: Remove print statement
 2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix 
fix: Mode of payment not fetcched in Item wise purchase register
 2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection (#20818) 2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922 fix: Mode of payment not fetcched in Item wise purchase register 2020-03-16 22:36:32 +05:30
Frappe PR Bot
b8b5fa6291
feat: Updated translation (#20954) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-03-16 17:59:42 +05:30
Saqib
1306f5005b
fix: is_pos gets reset on making s_inv from s_ord (#20886) 
* s_inv has is_pos default set as 1
 2020-03-16 17:51:00 +05:30
Anurag Mishra
c0b1c372a4
fix: local variable 'benefit_amount' referenced before assignment (#20949) 2020-03-16 16:53:03 +05:30
Saqib
de4f6901d6
fix: serial_no_selector showing for non serialized batched item (#20851) 2020-03-16 16:29:10 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix 
fix: Get invoice details only if invoice is selected
 2020-03-16 15:56:32 +05:30
Deepesh Garg
d190cc0198
Merge pull request #20835 from Thunderbottom/welcome-email-fix 
fix: use ERPNext in welcome email when default company is not set
 2020-03-16 15:54:53 +05:30
Prssanna Desai
e71153cbee
fix: fix options of currency fieldtype in Expense Taxes and Charges (#20901) 2020-03-16 15:52:25 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts (#20940) 
* Add account_type and tax rate to some VAT accounts

* fix indentation
 2020-03-16 15:45:05 +05:30
Himanshu Warekar
841be6713b Merge branch 'develop' of https://github.com/frappe/erpnext into custom_append_to 2020-03-13 19:40:00 +05:30
Rucha Mahabal
cd31996b81 fix: check fee validity in a single function 2020-03-13 15:39:31 +05:30
Deepesh Garg
0b7acc0fd6 fix: Create Item tax template only for specific account types 2020-03-13 11:51:14 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor 2020-03-12 19:44:27 +05:30
Shivam Mishra
c06ba54f1e
refactor: remove website (#20927) 2020-03-12 18:04:42 +05:30
Rucha Mahabal
05853efeb7 feat: Healthcare Domain Workspace with chart and shortcuts 2020-03-12 17:44:46 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card 2020-03-12 17:13:03 +05:30
Shivam Mishra
f241054c6c feat: extended settings page 2020-03-12 16:38:59 +05:30
Shivam Mishra
05d74bbcf9 feat: added loan management page 2020-03-12 16:38:49 +05:30
Shivam Mishra
451382e08e feat: update desk pages 2020-03-12 16:34:34 +05:30
Myuddin khatri
b9631a501f fix(shopping-cart): setting billing and shipping address 
setting billing and shipping address
 2020-03-12 16:21:38 +05:30
Myuddin khatri
4635ff9368 fix(shopping-cart): address is made mandatory to place order 2020-03-12 14:45:08 +05:30
Ronel Cabrera
fcb54762a1 feat(Contacts): select billing contact for sales invoice 2020-03-12 16:58:59 +08:00