Commit Graph

30711 Commits

Author SHA1 Message Date
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
Deepesh Garg
55e9bcb964
Merge pull request #21013 from frappe/sahil28297-patch-1
fix: develop version as 12.0.0-dev instead of 12.2.0
2020-03-27 21:26:26 +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
ba10630f27
Merge pull request #20905 from Thunderbottom/demo-fixed-asset-fix
fix: remove make_purchase_invoice from demo script
2020-03-27 11:32:45 +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
8404f4649e
Merge pull request #21075 from deepeshgarg007/loan_test_fix
fix: Randomly failing loan repayment test
2020-03-27 11:24:01 +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
Nabin Hait
fafba10219
fix: Ignored user permission for parent_company and existing_company field in Company (#21009) 2020-03-26 13:36: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
92e0fb7a27
Merge pull request #20653 from P-Froggy/develop
feat: Move SWIFT-number and branch-code from bank account to bank
2020-03-25 21:52:42 +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
ca3bf8f917
Merge pull request #21057 from deepeshgarg007/gstr_1_pos_validation
fix: Place of supply validation in GSTR-1 report
2020-03-25 17:02:10 +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
74a6fafc82
Merge branch 'develop' into healthcare_refactor 2020-03-25 02:13:12 +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