Saurabh
9ff39e2d1b
bumped to version 11.1.33
2019-05-22 22:54:17 +06:00
Saurabh
9d70c5d13f
Merge pull request #17704 from rohitwaghchaure/typo_pos_not_working
...
fix: typo
2019-05-22 22:21:51 +05:30
Rohit Waghchaure
a9a82919e7
fix: typo
2019-05-22 22:15:01 +05:30
Sahil Khan
723ed07642
Merge branch 'hotfix'
2019-05-22 15:54:26 +05:30
Sahil Khan
86b531aea6
bumped to version 11.1.32
2019-05-22 16:14:26 +05:50
rohitwaghchaure
781a420593
Merge pull request #17702 from rohitwaghchaure/not_able_to_submit_sales_invoice_italy_localization
...
fix: italy localization, not able to submit sales invoice
2019-05-22 15:48:12 +05:30
Rohit Waghchaure
08f709c2a2
fix: italy localization, not able to submit sales invoice
2019-05-22 15:28:47 +05:30
Nabin Hait
a849f6e21e
fix: update received qty in PO from PR and PI ( #17692 )
...
* fix: Don't set reqd date in PO based on MR, if less than today
* fix: update received qty in PO from PR
* fix: po status
* fix: set schedule date from MR to PO
2019-05-22 15:05:17 +05:30
rohitwaghchaure
6ff8387d56
Merge pull request #17679 from Anurag810/revert_change
...
fix(Revert): sales order status for order type 'Maintenance
2019-05-22 14:47:47 +05:30
rohitwaghchaure
2af9ff9c33
Merge pull request #17699 from rohitwaghchaure/italian_localization_issue_for_invoices
...
fix: removed translation for customer type and tax charge type
2019-05-22 13:21:20 +05:30
Rohit Waghchaure
01905cad2f
fix: removed translation for customer type and tax charge type
2019-05-22 13:17:46 +05:30
Anurag Mishra
58260e4f0a
Merge branch 'hotfix' into revert_change
2019-05-21 16:52:01 +05:30
Anurag Mishra
a01869bb20
style: refactor
2019-05-21 16:50:20 +05:30
Anurag Mishra
3a92615f23
Merge branch 'revert_change' of https://github.com/anurag810/erpnext into revert_change
2019-05-21 14:15:58 +05:30
Sahil Khan
eca8db7405
Merge branch 'hotfix'
2019-05-21 14:11:08 +05:30
Sahil Khan
58c4cfc0d7
bumped to version 11.1.31
2019-05-21 14:31:08 +05:50
Anurag Mishra
ab52a4db75
fix: refactor sales_order_list.js
2019-05-21 13:09:47 +05:30
Saurabh
c8d3a8c0f5
Merge pull request #17686 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings
...
fix: while making the item, default warehouse not set even if the stock settings has the default warehouse
2019-05-21 12:52:51 +05:30
rohitwaghchaure
aab88eee3e
Merge pull request #17644 from nabinhait/bom-item-rate
...
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-21 12:25:19 +05:30
Rushabh Mehta
d9f4c83567
Merge pull request #17539 from adityahase/fix-training-feedback-hotfix
...
fix(hr): Use event_status instead of status
2019-05-21 12:20:29 +05:30
Rushabh Mehta
b96dd366ce
Merge pull request #17641 from nabinhait/gle-opening-stock-reco
...
fix: GL Entry for opening stock reconciliation
2019-05-21 12:17:04 +05:30
rohitwaghchaure
597ec83af7
Merge pull request #17684 from rohitwaghchaure/item_group_not_disaplying_in_website
...
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-21 12:15:39 +05:30
Rohit Waghchaure
e802bdd186
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-21 12:11:40 +05:30
Rohit Waghchaure
3a949bb298
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-21 10:18:39 +05:30
rohitwaghchaure
1e920dd0d8
Merge pull request #17681 from rohitwaghchaure/expense_claim_reconciliation_issue
...
fix: payment reconciliation not update the status of the expense claim
2019-05-20 22:41:48 +05:30
Rohit Waghchaure
09536f402e
fix: payment reconciliation not update the status of the expense claim
2019-05-20 17:01:22 +05:30
Anurag Mishra
581f26b7a0
Merge branch 'hotfix' into revert_change
2019-05-20 16:22:20 +05:30
Deepesh Garg
0418a2f70a
Merge pull request #17677 from rohitwaghchaure/show_opening_entries_gl_report
...
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:21:28 +05:30
Saurabh
5e3338744c
Merge pull request #17675 from nabinhait/lead-from-email
...
fix: Person / Org name is not mandatory while creation of lead from email
2019-05-20 14:57:16 +05:30
Anurag Mishra
da3762700c
fix(Revert): sales order status for order type 'Maintenance
2019-05-20 12:38:33 +05:30
Rohit Waghchaure
2c9fccd8ba
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:25:53 +05:30
Nabin Hait
286c4fa640
fix: Person / Org name is not mandatory while creation of lead from email
2019-05-20 12:16:34 +05:30
Deepesh Garg
a144e002db
Merge pull request #17667 from deepeshgarg007/quotation-qty-fix
...
fix: Quotation to lead fix while changing item qty
2019-05-18 23:38:24 +05:30
deepeshgarg007
553dabaa08
fix: Pricing rule fix for lead
2019-05-18 21:31:58 +05:30
Anurag Mishra
55d0d32c77
fix: Allow return if delivery note or sales order is required in selling settings(v11) ( #17632 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:02:31 +05:30
Deepesh Garg
1f93745eef
Merge pull request #17663 from deepeshgarg007/opportunity-list-fixes
...
fix: Opportunity List view fix
2019-05-17 19:36:08 +05:30
deepeshgarg007
e3a02dd5f6
Merge branch 'hotfix' of https://github.com/frappe/erpnext into opportunity-list-fixes
2019-05-17 19:11:13 +05:30
deepeshgarg007
153733414f
fix: Opportunity List view fix
2019-05-17 19:08:24 +05:30
Deepesh Garg
ac535f0ce9
Merge pull request #17661 from deepeshgarg007/quotation_lead_fixes
...
fix: Quotation to lead fix
2019-05-17 18:35:49 +05:30
deepeshgarg007
3886529787
fix: Get lead details only if lead name entered
2019-05-17 18:10:13 +05:30
Deepesh Garg
d2cd713b89
Merge pull request #17657 from deepeshgarg007/territory_item_code_hotfix
...
fix: Inactive Sales Item report fixes
2019-05-17 15:41:50 +05:30
Deepesh Garg
6b378e1669
fix: Unable to create item variant based on manufacturer ( #17651 )
...
* fix: Unable to create item variant against manufacturer
* fix: Spacing fixes
* fix: Spacing fixes in item.js
2019-05-17 15:39:59 +05:30
deepeshgarg007
a4fc30bbe4
fix: Inactive Sales Item report fixes
2019-05-17 15:39:23 +05:30
rohitwaghchaure
b4b0e4424d
Merge pull request #17655 from rohitwaghchaure/not_able_to_make_si_from_dn
...
fix: not able to make si from dn
2019-05-17 15:29:04 +05:30
Rohit Waghchaure
f3bdcc2a84
fix: not able to make si from dn
2019-05-17 15:28:12 +05:30
Nabin Hait
19901c14c9
fix: Removed unused variable
2019-05-17 14:30:45 +05:30
Deepesh Garg
714d686e50
Merge pull request #17650 from deepeshgarg007/gstr2_fix
...
fix: GSTR 2 report fix
2019-05-17 11:24:44 +05:30
rohitwaghchaure
094dc1dee6
Merge pull request #17646 from rohitwaghchaure/fixed_bank_reco_internal_transfer
...
fix: bank reconciliation for internal transfer is not working
2019-05-17 11:20:43 +05:30
deepeshgarg007
cdcf424ba5
Merge branch 'hotfix' of https://github.com/frappe/erpnext into gstr2_fix
2019-05-17 10:30:39 +05:30
deepeshgarg007
2a2b884e32
fix: Return taxable value in get_row_data_for_invoice
2019-05-17 10:20:14 +05:30
