marination
|
075f6ea0d5
|
feat: Provision to fetch items from BOM in Stock Entry
Items are populated in child table and amounts are calculated
Warehouse Fields in popup toggle based on Stock Entry Type
|
2019-11-04 21:58:13 +05:30 |
|
Prssanna Desai
|
167aa7655d
|
Merge branch 'develop' into dashboard-fix
|
2019-11-04 15:42:20 +05:30 |
|
Gavin D'souza
|
05710804cf
|
fix: invoice creation tool of invoices with no paid and outstanding amounts
|
2019-11-04 14:45:11 +05:30 |
|
Deepesh Garg
|
50b6976c67
|
Merge pull request #19488 from DeeMysterio/dev-delivery-dn
fix(sales order): rename delivery to delivery note on sales order mak…
|
2019-11-04 13:17:12 +05:30 |
|
prssanna
|
7e2b030052
|
fix: fix dashboard with date range
|
2019-11-04 13:07:27 +05:30 |
|
Diksha
|
7091a2102c
|
fix(sales order): rename delivery to delivery note on sales order make button
|
2019-11-04 12:03:35 +05:30 |
|
Pranav Nachnekar
|
af18b2cdc5
|
Merge branch 'develop' into scheduling-ui-rewrite
|
2019-11-04 04:38:59 +00:00 |
|
Deepesh Garg
|
b565e9ba64
|
Merge pull request #19309 from sagargharge/develop
fix: restricted duplicate guardians on student doctype (#19194)
|
2019-11-04 09:04:29 +05:30 |
|
Mangesh-Khairnar
|
e3bc213262
|
feat: multiple company pos profile
|
2019-11-01 22:35:08 +05:30 |
|
rohitwaghchaure
|
475d8e3cdc
|
Merge pull request #19477 from rohitwaghchaure/production_plan_warehouse_not_changed
fix: Wrong warehouse fetched in production plan
|
2019-11-01 16:46:46 +05:30 |
|
Deepesh Garg
|
0bcf8b64f6
|
Merge pull request #19422 from marination/search-field
fix: Search field entries included in Item Link field query
|
2019-11-01 15:38:25 +05:30 |
|
Rohit Waghchaure
|
1bb5d01192
|
fix: Wrong warehouse fetched in production plan
|
2019-11-01 14:24:21 +05:30 |
|
Deepesh Garg
|
ebf46120ba
|
Merge pull request #18985 from Alchez/dev-serial-no-statuses
feat: add statuses for Serial No
|
2019-11-01 14:16:45 +05:30 |
|
0Pranav
|
e573bd9074
|
remove unnecessary variable
|
2019-11-01 12:47:11 +05:30 |
|
0Pranav
|
53ec8c6322
|
Merge branch 'develop' of https://github.com/0Pranav/erpnext into scheduling-ui-rewrite
|
2019-11-01 12:40:08 +05:30 |
|
deepeshgarg007
|
c82aed0718
|
fix: Add missing semicolon
|
2019-11-01 12:36:33 +05:30 |
|
0Pranav
|
97f6576213
|
prettify confirmation email
|
2019-11-01 12:36:06 +05:30 |
|
0Pranav
|
54f33f4e5d
|
move utility functions
|
2019-11-01 12:14:21 +05:30 |
|
0Pranav
|
3609872760
|
rename function
|
2019-11-01 12:06:42 +05:30 |
|
Deepesh Garg
|
9378aacbe5
|
Merge pull request #17151 from Alchez/develop-company-address-label
fix(selling): Add missing label to company address field
|
2019-11-01 11:56:08 +05:30 |
|
0Pranav
|
6de68c8671
|
avoid repetition on get_form date
|
2019-11-01 09:51:32 +05:30 |
|
0Pranav
|
957c9f5ff0
|
fix:comments
|
2019-11-01 09:36:45 +05:30 |
|
0Pranav
|
4701bc8bfc
|
Add ignore permissions for opportunity
|
2019-11-01 09:36:29 +05:30 |
|
Deepesh Garg
|
3cbd70a1d9
|
Merge pull request #19316 from joelios/develop
fix: Unable to create timesheet from project dashboard
|
2019-10-31 23:28:13 +05:30 |
|
Deepesh Garg
|
2ec7acb592
|
Merge pull request #19294 from vijaywm/duplicate-attendance
fix: Typo in attendance date filter
|
2019-10-31 16:46:52 +05:30 |
|
Ashish Shah
|
28710cdf99
|
fix: coupon code changes suggested by prasad (#19352)
* changes suggested by prasad
* codacy correction
|
2019-10-31 16:09:06 +05:30 |
|
Mangesh-Khairnar
|
45c18b3184
|
fix: fetch employee department (#19433)
|
2019-10-31 16:00:52 +05:30 |
|
Suraj Shetty
|
519ca54f53
|
feat: Show timesheets related to customer's projects on customer portal (#19443)
* fix: Show timesheets related to customer's projects on customer portal
* style: fix codacy
|
2019-10-31 16:00:04 +05:30 |
|
Suraj Shetty
|
77e4cf89f8
|
fix: Pass parent_acc_name (#19450)
|
2019-10-31 15:57:31 +05:30 |
|
deepeshgarg007
|
4a1d000c33
|
fix: Test Case
|
2019-10-31 15:57:15 +05:30 |
|
rohitwaghchaure
|
81c217584a
|
fix: purchase order issue, margin_rate_or_amount not there in the purchase documents (#19466)
|
2019-10-31 15:56:10 +05:30 |
|
Anurag Mishra
|
a11e738801
|
feat: Stock value and account balance sync. (#19233)
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
|
2019-10-31 15:55:03 +05:30 |
|
0Pranav
|
e494144c96
|
merge settings fetch, add helpers
|
2019-10-31 15:38:39 +05:30 |
|
0Pranav
|
60093d98b0
|
auto assign before creating event
|
2019-10-31 15:37:57 +05:30 |
|
0Pranav
|
d1c530c564
|
fix: merge settings into one call
|
2019-10-31 15:36:33 +05:30 |
|
gavin
|
7e9b90ad06
|
Merge pull request #19448 from gavindsouza/hooks-update
chore: moves email digest to long job from regular
|
2019-10-31 14:35:14 +05:30 |
|
gavin
|
450da16dc2
|
Merge branch 'develop' into hooks-update
|
2019-10-31 11:26:37 +05:30 |
|
rohitwaghchaure
|
139c20a736
|
Merge pull request #19454 from rohitwaghchaure/fix_item_price_stock_report_not_working_v12
fix: item price stock report not working
|
2019-10-30 22:30:10 +05:30 |
|
marination
|
1e754b161c
|
fix: Fetching catched meta and removed description fetch from Search Fields
Description is conditionally fetched and also used in WHERE clause, that is maintained.
Improved naming
|
2019-10-30 18:33:44 +05:30 |
|
gavin
|
8ed6772727
|
Merge branch 'develop' into hooks-update
|
2019-10-30 17:52:36 +05:30 |
|
gavin
|
ad04d442a1
|
Merge pull request #19442 from 0Pranav/maintainance-ux-fix
fix: maintenance schedule ux
|
2019-10-30 17:51:55 +05:30 |
|
rohitwaghchaure
|
99c8245512
|
Merge pull request #19456 from frappe/revert-19432-showing_untitled_name_in_item_tax_template
Revert "fix: patch, item tax template showing 'Untitled' in the name"
|
2019-10-30 17:38:02 +05:30 |
|
rohitwaghchaure
|
6bd6039496
|
Revert "fix: patch, item tax template showing 'Untitled' in the name"
|
2019-10-30 17:37:22 +05:30 |
|
Pranav Nachnekar
|
c02cb6ca94
|
Merge branch 'develop' into maintainance-ux-fix
|
2019-10-30 11:15:44 +00:00 |
|
rohitwaghchaure
|
1545ee914a
|
Merge pull request #19432 from rohitwaghchaure/showing_untitled_name_in_item_tax_template
fix: patch, item tax template showing 'Untitled' in the name
|
2019-10-30 16:33:56 +05:30 |
|
rohitwaghchaure
|
7b6ab9738d
|
Merge pull request #19446 from rohitwaghchaure/not_able_to_select_project_in_work_order
fix: not able to select the project in the work order
|
2019-10-30 16:32:34 +05:30 |
|
Rohit Waghchaure
|
d8b64cd199
|
replaced frappe.db.sql with frappe.get_all
|
2019-10-30 16:27:58 +05:30 |
|
Rohit Waghchaure
|
2e01573a40
|
fix: item price stock report not working
|
2019-10-30 16:22:30 +05:30 |
|
Deepesh Garg
|
fac4eb919b
|
Merge pull request #19445 from scmmishra/typo-fix
fix: typo in production plan
|
2019-10-30 16:03:56 +05:30 |
|
gavin
|
e0348c9ec8
|
Merge branch 'develop' into hooks-update
|
2019-10-30 15:46:46 +05:30 |
|