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 |
|
Pranav Nachnekar
|
66e5e16a2e
|
Merge branch 'develop' into maintainance-ux-fix
|
2019-10-30 09:54:47 +00:00 |
|
Gavin D'souza
|
d38f5374cb
|
chore: moved email digest to long job
|
2019-10-30 14:43:58 +05:30 |
|
Mangesh-Khairnar
|
83c7b5b44b
|
fix(bom): maintain a default bom for an item (#19407)
|
2019-10-30 14:25:50 +05:30 |
|
Mangesh-Khairnar
|
7638788c2f
|
fix: calculate pending leaves (#19411)
|
2019-10-30 14:23:41 +05:30 |
|
Rohit Waghchaure
|
486a8f67a4
|
fix: not able to select the project in the work order
|
2019-10-30 14:22:49 +05:30 |
|
Anurag Mishra
|
5c9d92eabf
|
fix: On Specific case if no item code in name (#19419)
|
2019-10-30 14:18:16 +05:30 |
|
Shivam Mishra
|
afa03fd654
|
Merge branch 'develop' into typo-fix
|
2019-10-30 14:08:20 +05:30 |
|
Shivam Mishra
|
d8abac3278
|
fix: typo in production plan
|
2019-10-30 14:06:56 +05:30 |
|
0Pranav
|
c8333d4b41
|
fix: codacy
|
2019-10-30 13:48:01 +05:30 |
|
0Pranav
|
07b74533fe
|
fix: error message matches field name
|
2019-10-30 13:47:49 +05:30 |
|
Faris Ansari
|
e127d937f7
|
fix(ExpenseClaim): List filter config for Rejected and Unpaid (#19434)
|
2019-10-30 13:31:05 +05:30 |
|
0Pranav
|
da5bf5a7c4
|
fix:indentation
|
2019-10-30 11:24:58 +05:30 |
|
0Pranav
|
be5c6e7aec
|
fix:readability
|
2019-10-30 11:14:49 +05:30 |
|
0Pranav
|
0f0d6ce25c
|
Remove doctype related to appointment scheduling
|
2019-10-30 11:08:09 +05:30 |
|
Deepesh Garg
|
d0003408c4
|
Merge pull request #19438 from ahmadRagheb/patch-1
fix: getdate get imported twice
|
2019-10-30 10:58:12 +05:30 |
|
0Pranav
|
846c03889e
|
fix: hide schedule section on new forms
|
2019-10-30 10:51:25 +05:30 |
|
0Pranav
|
d2d0100c9a
|
fix:better error message when sales person is none
|
2019-10-30 10:48:13 +05:30 |
|
0Pranav
|
abbc08cb48
|
fix: hide generate schedule button on new forms
|
2019-10-30 10:46:16 +05:30 |
|
ahmadRagheb
|
2a72d1fee4
|
Update salary_slip.py
getdate imported twice
|
2019-10-29 19:49:08 +02:00 |
|
Rohit Waghchaure
|
b051fa37df
|
fix: patch, item tax template showing 'Untitled' in the name
|
2019-10-29 14:56:03 +05:30 |
|
Khushal Trivedi
|
eabd09da40
|
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
|
2019-10-29 14:55:06 +05:30 |
|
Faris Ansari
|
bcf107b9f7
|
chore: fix unexpected keyword in shopify_settings (#19430)
chore: fix unexpected keyword in shopify_settings
|
2019-10-29 14:25:37 +05:30 |
|
Deepesh Garg
|
118f2c7d64
|
Merge pull request #19402 from Mangesh-Khairnar/fix-dn-status
fix: sync delivery note status in both list view and form view
|
2019-10-29 14:17:38 +05:30 |
|
Chinmay D. Pai
|
702f9f929b
|
chore: rename undefined variable in shopify_log
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
|
2019-10-29 13:30:13 +05:30 |
|