Marica
f0e87f7fdd
fix: get_batch_qty_and_serial_no() requires argument 'stock_qty' ( #19693 )
2019-11-27 15:49:41 +05:30
Shivam Mishra
a791170f29
Merge pull request #19475 from 0Pranav/scheduling-ui-rewrite
...
feat: Appointment Schedulling
2019-11-26 13:43:14 +05:30
rohitwaghchaure
b5991e9264
Merge pull request #19683 from rohitwaghchaure/bom_ux_fixes_version_12
...
fix: BOM UX
2019-11-26 13:15:40 +05:30
0Pranav
fb1e87710b
Tweaks to success redirect
...
- 5 seconds wait before redirect
- Edited description for URL in settings
2019-11-26 12:14:41 +05:30
0Pranav
8d2b0d800c
Merge branch 'scheduling-ui-rewrite' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
2019-11-26 10:55:53 +05:30
0Pranav
2515022377
add condition for zero appointment slots
2019-11-26 10:55:28 +05:30
Deepesh Garg
5558ee8597
Merge pull request #19591 from 0Pranav/FR-ISS-152101
...
fix: add status "expired" to doctype quotation
2019-11-26 09:08:30 +05:30
Deepesh Garg
31a4fa5dd3
Merge pull request #19606 from deepeshgarg007/shareholder_refactor
...
refactor: Share Transfer code cleanup and refactor
2019-11-26 07:54:57 +05:30
deepeshgarg007
53a66ee386
fix: Method name in hooks, test case code clean up
2019-11-25 21:58:15 +05:30
rohitwaghchaure
0881557c7d
Merge pull request #19636 from rohitwaghchaure/not_able_to_submit_sales_invoice_e_invoice_issue
...
fix: e-invoice issue
2019-11-25 19:24:23 +05:30
Rohit Waghchaure
9326fb78f2
fix: BOM UX
2019-11-25 18:56:18 +05:30
Nabin Hait
ecc6b1917b
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-11-25 18:13:58 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Pranav Nachnekar
fc5d8fcd9f
Merge branch 'develop' into scheduling-ui-rewrite
2019-11-25 12:24:32 +00:00
0Pranav
b84e56ebb5
fix:travis tests
2019-11-25 17:32:02 +05:30
0Pranav
565d3efcdf
fetch updated document in test_quotation
2019-11-25 17:11:12 +05:30
Pranav Nachnekar
d63ad3bb5f
fix: add email group and newsletter links to CRM module view ( #19679 )
...
* fix: add email group and newsletter links to CRM module view
* chore: move email group to bottom
2019-11-25 16:50:47 +05:30
0Pranav
f9dec5201f
fix:tests
2019-11-25 16:42:07 +05:30
0Pranav
cf3a2f6579
set transaction date to yesterday
2019-11-25 16:26:04 +05:30
0Pranav
032baeac5b
don't submit quotation
2019-11-25 15:15:00 +05:30
Nabin Hait
e0912e4fcc
Merge branch 'v12-pre-release' into version-12
2019-11-25 15:11:24 +05:30
Nabin Hait
4d12f8acab
bumped to version 12.2.0
2019-11-25 15:31:23 +05:50
Nabin Hait
c856cb85d9
log: Change log for v12.2.0
2019-11-25 15:08:47 +05:30
0Pranav
754c43f6c3
fix set_expired_status method
2019-11-25 14:27:43 +05:30
0Pranav
e0c9f3c282
fix valid date
2019-11-25 14:14:51 +05:30
0Pranav
3ec5eabaf6
formatting
2019-11-25 14:11:31 +05:30
0Pranav
f2752bf38c
fix: tests for python2
2019-11-25 14:09:49 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg ( #19676 )
...
* fix: Prefilled JV via Account Balance and Stock Value mismatch error message
- Make JV button will route to Journal Entry and add rows in child table
* fix: make journal entry to sync stock and account balance
* fix: translated action label
2019-11-25 14:02:51 +05:30
0Pranav
a9ff7df2e6
add sql query to set valid_till
2019-11-25 12:55:27 +05:30
Nabin Hait
2fd6814cbf
Merge branch 'marination-account_stock_sync_error' into develop
2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4
fix: make journal entry to sync stock and account balance
2019-11-25 12:33:40 +05:30
Saqib
cd3976f7d2
Asset cancellation fix ( #19671 )
...
* fix: remove asset movement mandatory fields
* fix: label for reference doctype
2019-11-25 12:24:34 +05:30
Pranav Nachnekar
04e3a506e4
fix: Primary address not being fetched for customer ( #19667 )
...
* fix: priamry address not being fetched
* add doctype to filter for customer_primary_address
* remove get_customer_primary_address_method
2019-11-25 12:04:00 +05:30
0Pranav
a077795581
fix tests
2019-11-25 12:01:00 +05:30
0Pranav
eefc492ff4
call commit after sql query for schedular job
2019-11-25 10:51:27 +05:30
Saqib
c9203a1bee
fix: asset movement ux fixes ( #19637 )
2019-11-22 16:35:15 +05:30
Saqib
f37a46edea
Fixed Asset Refactor Review fixes ( #19665 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +05:30
Nabin Hait
aff4a67954
Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error
2019-11-22 15:14:32 +05:30
Marica
b5c296da9e
fix: Validation Error message on Prepared Report. ( #19639 )
...
Give the user the reason why he has to use filters.
2019-11-22 14:38:58 +05:30
Marica
7ca472780b
fix: Get Current Stock button not working in Purchase Receipt ( #19645 )
...
- Field visible in grid view as well for better feedback
2019-11-22 14:37:38 +05:30
Anurag Mishra
763660b2e4
fix: set allocated amount in employee advance as per total amount ( #19626 )
2019-11-22 13:32:25 +05:30
0Pranav
6c368e2dfb
submit quotation in test
2019-11-22 13:22:12 +05:30
0Pranav
b3354198f1
Fix sql query in set_expired_status
2019-11-22 12:38:43 +05:30
Mangesh-Khairnar
b10526dd86
fix: consider taxes in the grand total ( #19631 )
2019-11-22 12:28:33 +05:30
thefalconx33
fa42999314
fix: last purchase rate greater than selling price
2019-11-22 12:15:41 +05:30
Saqib
290253fdd0
fix: last purchase rate greater than selling price ( #19617 )
2019-11-22 12:12:29 +05:30
Deepesh Garg
24cde55e28
fix: Patch for updating price or product discount field ( #19642 )
...
* fix: Patch for updating price or product discount field
* fix: Update pactch
* Update update_price_or_product_discount.py
2019-11-22 11:57:42 +05:30
Ben Knowles
49cd19d917
fix: update syntax error in company.js ( #19661 )
2019-11-22 11:36:02 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting ( #19656 )
2019-11-22 11:35:14 +05:30
