deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
50ea99e35b
fix: Is group filter for dimensions for doctype
2019-05-28 12:13:53 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Nabin Hait
5fef786441
Merge pull request #17765 from nabinhait/salary-slip-tax-calc-dev
...
fix: Tax calculation on salary slip
2019-05-28 11:16:31 +05:30
Anurag Mishra
a69f72988a
fix: requested filters changes
2019-05-28 11:08:14 +05:30
Nabin Hait
351e9983cf
Merge pull request #17389 from mujeerhashmi/develop
...
feat: Student Group with Student Category filter
2019-05-27 19:14:31 +05:30
Nabin Hait
9813897ec3
Merge pull request #17759 from saurabh6790/custom_field_fix
...
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 19:12:39 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Nabin Hait
7f375d209c
fix: Tax calculation on salary slip
2019-05-27 18:42:53 +05:30
Anurag Mishra
32c23ae274
fix: added read write permission to stock manager
2019-05-27 18:37:04 +05:30
Anurag Mishra
61a7b42aea
fix: added permission and fix filters in stock balance report
2019-05-27 18:37:04 +05:30
Anurag Mishra
7376b4f4f0
feat: added warehouse type master
2019-05-27 18:37:04 +05:30
Nabin Hait
1f24a4d44c
Merge pull request #17691 from netchampfaris/upload-attendance-progress
...
fix(UX): Upload Attendance
2019-05-27 17:17:03 +05:30
Nabin Hait
e662be7508
Merge pull request #17697 from nabinhait/po-status-updater-dev-1
...
fix: update received qty in PO from PR and PI
2019-05-27 17:16:40 +05:30
Nabin Hait
4f549cc196
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 17:16:03 +05:30
Nabin Hait
aafd64d9b4
fix: On change of currency, set margin amount based on exchange rate ( #17712 )
2019-05-27 17:15:47 +05:30
Saurabh
fdf0d91087
fix: add shopify_supplier_id custom field while setting up shopify
2019-05-27 15:17:58 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Nabin Hait
99fa813799
Merge branch 'develop' into Product-Bundle-Balance
2019-05-27 14:01:00 +05:30
Nabin Hait
8b1d347cb5
Merge branch 'develop' into develop
2019-05-27 14:00:53 +05:30
Nabin Hait
275185438a
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-27 14:00:43 +05:30
Mitchy25
a8f6938556
Fix: Precision in Appraisals ( #17673 )
...
* Update appraisal.js
This fixes issues associated with 2 decimal places. Example: 4 questions (Each weighted 25%), will give a total result of 5.2 (If 5 achieved on every question). This is because 5*0.25 = 1.25 which is rounded to 1.3 for precision=2. When precision = 3, this is not an issue.
* fix: score based on field's precisin
2019-05-27 13:57:56 +05:30
Nabin Hait
235332d4ab
Merge branch 'develop' into lms-refactor
2019-05-27 13:47:45 +05:30
Nabin Hait
a659e615f3
Merge branch 'develop' into upload-attendance-progress
2019-05-27 13:47:36 +05:30
Nabin Hait
769024e2b6
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 13:47:15 +05:30
Nabin Hait
f3ccf0e949
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 13:47:07 +05:30
Deepesh Garg
5f2afb8803
fix: Do not fetch batch items and serialized items in stock reconciliation ( #17725 )
2019-05-27 13:42:29 +05:30
asbasawaraj
a281ce3dde
fix: Updated Field Labels in Work Order ( #17750 )
2019-05-27 13:33:37 +05:30
Deepesh Garg
7fc8b2fa50
fix: GSTR-1 Report B2B fixes ( #17751 )
...
* fix: GSTR-1 Report fixes
* fix: Simply add tax if item tax is not specified
2019-05-27 13:30:52 +05:30
Anurag Mishra
9d9440277c
fix: holidays was showing on same date in calendar view ( #17754 )
2019-05-27 13:20:42 +05:30
Nabin Hait
331dcc06c9
Merge branch 'develop' into upload-attendance-progress
2019-05-27 11:59:16 +05:30
Nabin Hait
6211e7343c
Merge branch 'develop' into po-status-updater-dev-1
2019-05-27 11:50:29 +05:30
Nabin Hait
ca8dae183a
Merge branch 'develop' into opening-stock-entry-dev
2019-05-27 11:50:16 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Faris Ansari
932a767de4
Merge branch 'develop' into upload-attendance-progress
2019-05-24 14:46:02 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
Rushabh Mehta
7e4fb49c61
fix(minor): after manual testing
2019-05-24 11:22:31 +05:30
Faris Ansari
513bfc26d2
Merge branch 'develop' into upload-attendance-progress
2019-05-23 20:04:16 +05:30
Nabin Hait
d8496a770a
fix: validate expense account for opening stock reco
2019-05-23 15:32:55 +05:30
rohitwaghchaure
0c2e3c77a3
fix: range 4 for ageing filter added in the AP/AR report ( #17715 )
2019-05-23 15:27:47 +05:30
rohitwaghchaure
fd4815da53
Merge pull request #17690 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_v12
...
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-23 15:04:43 +05:30
Faris Ansari
8f784c8555
fix: Remove console statement
2019-05-23 14:39:38 +05:30
Saurabh
ba04c3e5bb
fix: table name alias ( #17706 )
2019-05-23 14:16:56 +05:30
Nabin Hait
5173170be3
fix: validate expense account for opening stock entry
2019-05-23 12:10:51 +05:30
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
Nabin Hait
79f84e58ba
test: Add test case for opening stock entry gle
2019-05-23 11:16:12 +05:30
Nabin Hait
8770ea2631
fix: Opening accounting entry for stock entry
2019-05-23 11:15:04 +05:30
Saurabh
45cd60dfb2
Merge pull request #17645 from nabinhait/bom-item-rate-dev
...
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-22 18:58:34 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
Nabin Hait
318ba2b538
Merge branch 'develop' into lms-refactor
2019-05-22 15:15:51 +05:30
Nabin Hait
0ce85735b8
Merge branch 'develop' into set_default_warehouse_from_the_stock_settings_v12
2019-05-22 15:06:04 +05:30
Nabin Hait
13e0fcde0c
Merge branch 'develop' into upload-attendance-progress
2019-05-22 15:05:50 +05:30
Nabin Hait
5ee08620cb
Merge branch 'develop' into po-status-updater-dev-1
2019-05-22 15:05:08 +05:30
rohitwaghchaure
8529cde0f0
Merge pull request #17687 from rohitwaghchaure/set_default_warehouse_from_the_stock_settings_develop
...
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-22 13:23:44 +05:30
rohitwaghchaure
0432d3844b
Merge pull request #17700 from rohitwaghchaure/italian_localization_issue_for_invoices_develop
...
fix: removed translation for customer type and tax charge type
2019-05-22 13:23:25 +05:30
Rohit Waghchaure
68a1456672
fix: removed translation for customer type and tax charge type
2019-05-22 13:22:39 +05:30
Nabin Hait
ecf25907a5
fix: set schedule date from MR to PO
2019-05-22 13:07:26 +05:30
Nabin Hait
bfb09d51a3
fix: test cases
2019-05-22 12:15:56 +05:30
Nabin Hait
b7bdcc3992
fix: Don't set reqd date in PO based on MR, if less than today
2019-05-22 12:01:17 +05:30
Nabin Hait
915edbf9ce
fix: po status
2019-05-22 12:00:36 +05:30
Nabin Hait
d752051b8d
fix: update received qty in PO from PR
2019-05-22 11:59:19 +05:30
Faris Ansari
9e5665dc0a
Merge branch 'develop' into upload-attendance-progress
2019-05-21 18:01:30 +05:30
Faris Ansari
81e698d225
fix(UX): Upload Attendance
...
Enqueue import if rows more than 200. Show import progress in dashboard.
2019-05-21 17:58:55 +05:30
Rohit Waghchaure
c41118bac7
Get default warehouse from the stock settings in the get_item_details
2019-05-21 15:21:13 +05:30
Nabin Hait
7327f8a901
fix: Person / Org name is not mandatory while creation of lead from email ( #17676 )
2019-05-21 15:05:26 +05:30
Rushabh Mehta
98a80407f8
Merge pull request #17538 from adityahase/fix-training-feedback
...
fix(hr): Use event_status instead of status
2019-05-21 12:19:03 +05:30
Rushabh Mehta
397a48d11f
Merge pull request #17640 from nabinhait/gle-opening-stock-reco-dev
...
fix: GL Entry for opening stock reconciliation
2019-05-21 12:17:22 +05:30
Rohit Waghchaure
5e7b4ca6a4
fix: while making the item, default warehouse not set even if the stock settings has the warehouse
2019-05-21 12:14:16 +05:30
Shivam Mishra
87a7438d38
chore: added macro for page hero
2019-05-21 12:05:19 +05:30
Shivam Mishra
c8c790a097
feat: Added content page and minor doctype changes
2019-05-21 12:04:50 +05:30
Rushabh Mehta
8c78299158
fix(readme): logo
2019-05-21 11:57:33 +05:30
Rohit Waghchaure
6358370735
fix: item group not disaplying in the website if shopping cart is disabled
2019-05-21 10:53:39 +05:30
deepeshgarg007
ff717a7c16
fix: List view button for dimensions
2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
...
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716
feat(Communication): Move Timeline DocType and Name to Dynamic Links ( #17593 )
...
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Mangesh-Khairnar
57c861efc3
feat: add patch to create custom fields for india specific client
2019-05-20 13:08:18 +05:30
Rohit Waghchaure
97d2a46052
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:28:57 +05:30
Shivam Mishra
d7e8298a5f
feat: added program and course pages
2019-05-20 11:55:32 +05:30
Shivam Mishra
823c79588b
feat: Moving to Jinja
2019-05-19 16:01:45 +05:30
deepeshgarg007
4541605e27
fix: Test Case for accounting dimension
2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e
fix: Rename function in accounting dimension
2019-05-19 11:13:21 +05:30
deepeshgarg007
3d11ac0e75
fix: Accounting dimensions for child tables
2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017
fix: Ability to disable dimensions
2019-05-18 23:47:42 +05:30
Anurag Mishra
fc86df6453
fix: Allow return if delivery note or sales order is required in selling settings(v12) ( #17631 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:03:08 +05:30
Syed Mujeer Hashmi
045194c230
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2019-05-17 16:26:31 +05:30
Deepesh Garg
2cab66cda1
Merge pull request #17658 from deepeshgarg007/territory_item_code_develop
...
fix: Inactive Sales Item report fixes
2019-05-17 16:20:30 +05:30
deepeshgarg007
a4c9134d33
fix: Inactive Sales Item report fixes
2019-05-17 16:19:15 +05:30
Deepesh Garg
e796d2844c
fix: Unable to create item variant based on manufacturer ( #17652 )
...
* fix: Unable to create item variant against manufacturer
* fix: Spacing fixes
* fix: Spacing fixes in item.js
2019-05-17 15:39:22 +05:30
Nabin Hait
9764eff1a4
Merge branch 'develop' into gle-opening-stock-reco-dev
2019-05-17 14:34:39 +05:30
rohitwaghchaure
c356fef9c4
Merge pull request #17599 from Anurag810/bom_items_and_scraps
...
feat: added report for showing complete hierarchy of bom with item details and scraps
2019-05-17 11:22:12 +05:30
deepeshgarg007
705c03c093
fix: Added dashboard and module links for accounting dimensions
2019-05-17 10:23:00 +05:30
Rohan
a094560b8b
fix(tests): Save batch instead of submitting it ( #17637 )
2019-05-16 19:44:55 +05:30
Rushabh Mehta
8ec3718aba
Merge pull request #17625 from rmehta/link-preview-item-task
...
fix: link preview for item and task
2019-05-16 19:35:05 +05:30
Nabin Hait
06c8cf4321
fix: BOM Item rate based on uom conversion factor and exchange rate
2019-05-16 19:23:00 +05:30
Anurag Mishra
15e2546846
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 18:24:04 +05:30
Nabin Hait
3f119ec256
fix: GL Entry for opening stock reconciliation
2019-05-16 17:29:10 +05:30
Anurag Mishra
dd5d4c49c4
fix: indent
2019-05-16 17:08:44 +05:30
Rohit Waghchaure
cb4e28fb31
fix: changed fieldtype from data to float
2019-05-16 17:01:05 +05:30
Shivam Mishra
8a976ba8ab
feat: LMS is now compatible with Frappe Theme ( #17600 )
...
* style: UI fixes for frappe_theme compatibility
* chore: minor ui fixes
2019-05-16 16:38:13 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev
...
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
rohitwaghchaure
144e60a234
Update bom_items_and_scraps.py
2019-05-16 15:03:30 +05:30
Anurag Mishra
39c80789c9
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:59:38 +05:30
Rushabh Mehta
a02ab2d3d7
Merge pull request #17635 from nabinhait/add-multiple-items-dev
...
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:57:03 +05:30
Nabin Hait
3fccfaa7ce
feat: Added 'Add Multiple' options in all sales / purchase transactions
2019-05-16 14:54:05 +05:30
Anurag Mishra
b921d9f94d
Merge branch 'develop' into bom_items_and_scraps
2019-05-16 14:24:16 +05:30
Nabin Hait
2a8c463079
fix: show tasks in project order by due date and status
2019-05-16 13:46:05 +05:30
Nabin Hait
b90fc7fc0d
fix: Get bank account on selection of payment mode in Loan
2019-05-16 13:45:54 +05:30
Nabin Hait
ab1c43dbee
fix: To allow creation of sales invoice without customer
2019-05-16 13:45:36 +05:30
Anurag Mishra
6f619e2bbf
Merge branch 'develop' into subs
2019-05-16 12:52:26 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Anurag Mishra
b6a4a02dc2
Merge branch 'develop' into subs
2019-05-16 10:48:21 +05:30
Himanshu
0e31089af6
validate: if additional salary exists ( #17529 )
2019-05-16 10:35:02 +05:30
Rushabh Mehta
fd6ae67b16
fix: link preview for item and task
2019-05-16 10:25:27 +05:30
Prasad Ramesh
067d3c0c09
fix: made Sales Partner Comission report visible in Selling module ( #17602 )
2019-05-16 10:18:02 +05:30
Anurag Mishra
1a98cce3a4
Merge branch 'develop' into subs
2019-05-15 16:40:03 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766
fix: Create property setter for budget if dimension is created
2019-05-15 12:20:37 +05:30
Saurabh
9da57d79b5
fix: reload docs before creating custom fields ( #17586 )
2019-05-15 11:39:41 +05:30
Mohamed Al Zubaidi
4c0f754a96
Fix typos ( #17601 )
2019-05-15 11:38:56 +05:30
Karthikeyan S
c3779851e4
fix(HR Settings): Unable to save HR Settings ( #17608 )
2019-05-15 11:38:20 +05:30
rohitwaghchaure
d07a3e1de2
fix: limit offset was missing in the get_delivery_notes_to_be_billed method ( #17611 )
2019-05-15 07:46:28 +05:30
rohitwaghchaure
32d91b2c00
fix: not able to create the sales invoice without item code ( #17612 )
2019-05-15 07:41:44 +05:30
Himanshu
abcb6aea00
fix: do not remove assignment when closed ( #17613 )
2019-05-14 20:07:53 +00:00
Mangesh-Khairnar
cf71a84976
style: formatting changes
2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736
fix: reload doc on generation of text file
2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6
feat: add account field in payment order
2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
557419a745
feat: load company bank account
2019-05-14 18:30:19 +05:30
Mangesh-Khairnar
d9140dc772
feat: add party bank account field
2019-05-14 18:28:24 +05:30
Mangesh-Khairnar
6175eb2cf9
feat: add validation for fields
2019-05-14 18:25:57 +05:30
Faris Ansari
ec7b064528
fix: Clear messages during setup fixtures
2019-05-14 16:21:09 +05:30
deepeshgarg007
60f4dd0736
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-14 15:51:12 +05:30
Anurag Mishra
52f31d211d
Merge branch 'develop' into bom_items_and_scraps
2019-05-14 15:29:43 +05:30
Shivam Mishra
621cdeb36a
Merge pull request #17592 from scmmishra/acad-fixes
...
fix: bug fixes in LMS
2019-05-14 15:20:22 +05:30
Anurag Mishra
f1f2a3eed0
feat: added report for showinrg complete hierarchy of bom with item details and scraps
2019-05-14 15:04:26 +05:30
Saurabh
1d90ebb16a
Merge pull request #17579 from rmehta/remove-feedback-trigger
...
fix: remove link to feedback trigger
2019-05-14 14:38:30 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Shivam Mishra
776d891b19
fix: test for course
2019-05-14 14:16:50 +05:30
Shivam Mishra
f82d0a6074
fix: show video duration and publish date only if data exists
2019-05-14 12:02:51 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
Shivam Mishra
2430fd3a4c
chore: show description on course card
2019-05-14 11:24:51 +05:30
Shivam Mishra
f2d62195b0
chore: Minor code improvements
2019-05-14 11:24:45 +05:30
Shivam Mishra
d2c4af154b
fix: Video not found bug
2019-05-14 11:24:40 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS ( #17587 )
2019-05-14 10:22:15 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216
fix: Commified function to get dimensions
2019-05-14 08:50:45 +05:30
Anurag Mishra
73706f85aa
feat: Bank remittance report for tracking payroll-entry transactions ( #17013 )
...
* feat: Bank remittance report for tracking payroll-entry transactions
* feat: show Company bank account and bank name
* feat: Added Permissions to view report
* feat: Validated report only if debit account is present
* fix: query optimisation
* feat: Added From date and To date filters
* fix: code optimisation
* fix: requested changes
* fix: requested changes and refactor
* style: indentation
* style: Formatting
* fix: added parameter filters
2019-05-13 19:03:21 +05:30
Deepesh Garg
dbf9251324
Merge branch 'develop' into blanket_order_in_selling_module_page
2019-05-13 16:49:47 +05:30
Basawaraj Savalagi
09bafc6d10
feat: Added Link to Blanket Orded in Selling Module Page
2019-05-13 14:59:19 +05:30
Rushabh Mehta
cb83742859
fix: remove link to feedback trigger
2019-05-13 14:19:09 +05:30
Saurabh
9706aaab65
Merge pull request #17556 from Alchez/develop-lead-import-fix
...
feat(crm): Allow leads to be imported without person name
2019-05-13 12:10:12 +05:30
Saurabh
1ab0b78ece
Merge pull request #17569 from Mangesh-Khairnar/training-event-fix
...
feat: validate training event period
2019-05-13 11:47:39 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
...
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
deepeshgarg007
0c874d915b
fix: Indentation fixes
2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63
fix: Show all territories and items in inactive sales item report
2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1
fix: Added dimensions in financial reports and general ledger
2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
b4e8128fdb
feat: validate training event period
2019-05-11 23:26:47 +05:30
Mangesh-Khairnar
4df61b1495
fix: join multiple emails
2019-05-11 20:10:20 +05:30
Mangesh-Khairnar
cd4289e10e
feat: remove button on import of an order
2019-05-11 20:04:03 +05:30
Rohan Bansal
9778ff8ab3
feat(crm): Allow leads to be imported without person name
2019-05-10 16:09:48 +05:30
Suraj Shetty
b68ae15dec
fix: Check permissions before renaming the account
2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05
fix: Show "Merge Account" button only to users with write access
2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382
fix: test cases
2019-05-10 14:31:07 +05:30
Saurabh
a15908f6a3
Merge pull request #17542 from rohitwaghchaure/project_update_statue_emails_sending_frequestly_develop
...
fix: project update status emails sent frequently
2019-05-10 13:24:50 +05:30
rohitwaghchaure
490411ba28
Update project.py
2019-05-10 12:03:20 +05:30
Saurabh
b10392134d
Merge pull request #17544 from surajshetty3416/improve-item-search-perf
...
perf: Index show_in_website field for faster item search
2019-05-10 11:54:54 +05:30
rohitwaghchaure
8b7a5133a6
Merge pull request #17522 from rohitwaghchaure/invoiced_items_gross_margin_api_develop
...
feat: Get invoiced item's gross margin using API
2019-05-09 19:57:02 +05:30
Rohit Waghchaure
4a267b9340
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-09 19:52:53 +05:30
Suraj Shetty
2df91addd7
perf: Index show_in_website field for faster item search
2019-05-09 19:19:34 +05:30
Rohit Waghchaure
6b9543b213
fix: project update status emails sent frequently
2019-05-09 19:06:31 +05:30
Aditya Hase
5f1632cf1f
fix(hr): Use event_status instead of status
...
Training Feedback DocType has event_status field (not status)
This was broken since PR #10379 , PR #17197 made this failure explicit.
2019-05-09 19:00:05 +05:30
sahil28297
ce82e4fd54
Merge branch 'develop' into sync_site_develop
2019-05-09 14:48:39 +05:30
deepeshgarg007
9a05ce10d9
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-09 14:43:45 +05:30
Sahil Khan
73e281d339
feat(sync_site): return more data in level
2019-05-09 14:32:15 +05:30
Mangesh-Khairnar
93c9a99548
style: change formatting
2019-05-09 12:23:24 +05:30
deepeshgarg007
19c8802971
fix: Precision fixes in gstr3b-report
2019-05-09 12:15:56 +05:30
deepeshgarg007
2097916d9e
fix: Invoice type fixes in gstr-1 report
2019-05-09 12:15:29 +05:30
Saurabh
2b6b504f30
Merge branch 'develop' into invoiced_items_gross_margin_api_develop
2019-05-09 12:06:12 +05:30
rohitwaghchaure
4d2c307d6d
Merge pull request #17475 from netchampfaris/item-variant-attributes-optional
...
fix: Allow variant attributes to be optional
2019-05-09 00:54:45 +05:30
Deepesh Garg
35226b1f32
Merge pull request #17415 from deepeshgarg007/notification
...
feat: Track purchase receipt status in material request
2019-05-09 00:03:34 +05:30
Shivam Mishra
374999b048
feat: Password protected salary slips ( #17380 )
...
* feat: Added check for encrypting salary slips and password policy field
* feat: make password policy mandatory if encrypt option is selected
* feat: added password logic to email_salary_slip
* fix: import error
* chore: Minor enhancement to validations in salary slip
* fix: travis patch
* feat: Modified email body for password protected salary slips
2019-05-08 17:30:08 +05:30
Mangesh-Khairnar
644e181729
feat: remove first row if empty
2019-05-08 16:17:31 +05:30
Mangesh-Khairnar
3ca8976037
feat: add validation for fetching doc status
2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805
feat: add status field to create payment order
2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858
feat: assign pe status on creation of payment order
2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf
fix: display generate txt on submission
2019-05-08 15:58:26 +05:30
Mangesh-Khairnar
0b2fc4fbc1
fix: multiple changes
2019-05-08 15:57:29 +05:30
Rohit Waghchaure
7bee502d72
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d
feat: Get invoiced item's gross margin using API
2019-05-08 15:38:05 +05:30
Rohit Waghchaure
0cb7024e55
fix: job card issue, added validation in the stock entry
2019-05-08 15:14:12 +05:30
Saurabh
27e7ae6773
Merge branch 'develop' into procurement-tracker
2019-05-08 11:30:38 +05:30
deepeshgarg007
321124aa72
fix: Resolve merge conflict in json files
2019-05-08 10:33:08 +05:30
deepeshgarg007
e13a56cc80
Merge branch develop into notification
2019-05-08 10:16:30 +05:30
Anurag Mishra
c3dcf02784
test: subcontracted raw materials to be recieved
2019-05-07 17:43:48 +05:30
Anurag Mishra
58bd2df834
fix: code refactor
2019-05-07 17:42:22 +05:30
Anurag Mishra
9acb2bf28f
test: for subcontracting item be received
2019-05-07 14:38:30 +05:30
Faris Ansari
9a45bd11d6
Merge branch 'develop' into item-variant-attributes-optional
2019-05-07 14:25:03 +05:30
Faris Ansari
fde4fa7b60
fix(test): Convert values to list
2019-05-07 13:29:00 +05:30
Faris Ansari
23fecc0dbb
perf: Task import with Project ( #17496 )
...
When tasks are imported with their Project set, import slows down as
number of tasks increase. This is largely due to `load_tasks` being
called in Project which is only required when Form loads. So, we can
skip it during import.
Also, converted some get_doc calls to get_cached_doc.
2019-05-07 12:38:24 +05:30
Faris Ansari
a90fe810b3
fix(UX): Cancel tasks if project is cancelled ( #17497 )
2019-05-07 12:37:38 +05:30
Mangesh-Khairnar
b8d0dec7f5
feat: filter bank from company account
2019-05-07 11:29:20 +05:30
Mangesh-Khairnar
e8bea2e936
feat: set payment order type on mapping
2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce
feat: show generate txt button for payment entry
2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
27ea171187
style: change formatting
2019-05-06 16:37:34 +05:30
Mangesh-Khairnar
66a3c99800
feat: fetch custom fields for remittance creation
2019-05-06 16:26:05 +05:30
Mangesh-Khairnar
9215de02c5
feat: add india specific custom fields in company
2019-05-06 16:24:10 +05:30
Faris Ansari
ff9177a6ce
fix: Handle attribute filter when no items found
2019-05-06 15:59:51 +05:30
Faris Ansari
aa7ce883ed
fix: Dont include disabled items in cache
2019-05-06 15:59:34 +05:30
Mangesh-Khairnar
09d4933edb
fix: filter pi item based on po completeion
2019-05-06 12:53:52 +05:30
Mangesh-Khairnar
525d8cefc1
fix: post process mapping
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b
feat: generate file name
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b
feat: check bulk update option
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8
feat: add advice row
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb
fix: pass account paid information to postprocess
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
b89db7f5a8
feat: add logic to generate txt file
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2
feat: add payment entry field
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364
perf: improve mapping function speed
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478
feat: add generate txt file button for india region
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c
feat: add mapping logic for creating payment order
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189
feat: create payment order from payment entry
2019-05-05 22:37:20 +05:30
Himanshu
ac1ce5d205
fix: Remove Scheduling Tool if exists ( #17473 )
...
* fix: scheduling tool
* fix: patch for scheduling tool
* fix: remve drop table
2019-05-04 22:43:37 +05:30
Rohan
174aa24529
fix(stock): Allow expired batches to be flushed out of the system ( #17478 )
2019-05-04 22:41:05 +05:30
Rushabh Mehta
e12bedc0c2
fix: unlink task rather than deleting it ( #17485 )
2019-05-04 22:39:31 +05:30
Faris Ansari
14425575b7
fix: Rebuild cache in background ( #17487 )
2019-05-04 22:38:13 +05:30
Himanshu
5cf12a4640
fix(Purchase Order): fetch payment terms ( #17121 )
...
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
2019-05-04 22:37:35 +05:30
Himanshu Warekar
24442af9ae
fix: use list comprehension
2019-05-04 22:35:52 +05:30
Himanshu Warekar
fbed6a12d5
fix: calculate percentage only if sales team exist
2019-05-04 22:35:52 +05:30
Himanshu Warekar
40b99e3347
fix: sales percentage equal to 100
2019-05-04 22:35:52 +05:30
Himanshu Warekar
5ca977a41c
fix: python side validation
2019-05-04 22:35:52 +05:30
Himanshu Warekar
76eddcc29f
fix: validate percentage total
2019-05-04 22:35:52 +05:30
deepeshgarg007
b4ad5c0158
feat: Ability to add custom dimensions
2019-05-04 20:29:21 +05:30
Rushabh Mehta
2df16b1f9b
fix(style): demo home page
2019-05-04 11:09:19 +05:30
Mangesh-Khairnar
e003cc8812
fix: filter out completed purchase receipt
2019-05-03 16:41:04 +05:30
Mangesh-Khairnar
13d393247a
feat: add date range filters
2019-05-03 16:00:02 +05:30
Anurag Mishra
d0cdb4a1e9
feat: subcontracting report
2019-05-03 14:05:29 +05:30
Faris Ansari
ab14892fc5
fix: Variant naming if optional attributes
2019-05-03 13:57:20 +05:30
Faris Ansari
cb03bb1c00
fix: Allow variant attributes to be optional
2019-05-03 13:41:50 +05:30
Deepesh Garg
8ca3df7aac
Merge pull request #17466 from deepeshgarg007/inactive-items-fix-develop
...
fix: Inactive sales items report fix
2019-05-03 11:54:05 +05:30
deepeshgarg007
3c1b9aa77b
fix: Remove patch
2019-05-03 09:47:38 +05:30
Nabin Hait
f13abe8332
Merge pull request #17464 from Mangesh-Khairnar/task-unlink
...
feat: unlink task from project on task deletion
2019-05-03 09:20:34 +05:30
deepeshgarg007
6c6b24011f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop
2019-05-02 23:03:59 +05:30
Faris Ansari
b9dc4687dc
fix: Remove parens
2019-05-02 20:14:16 +05:30
deepeshgarg007
9ae112bbfc
fix: Inactive items report fix
2019-05-02 19:38:15 +05:30
Mangesh-Khairnar
ffd4990a70
feat: unlink task from project on task deletion
2019-05-02 19:19:03 +05:30
Nabin Hait
73041269e9
refactor: Project and billing summary
2019-05-02 18:13:31 +05:30
Nabin Hait
bd0d10f82a
Merge pull request #17448 from nabinhait/woocommerce-multilingual-fix-dev
...
fix: Multilingual handling in woocommerce integration
2019-05-02 12:57:34 +05:30
Nabin Hait
218d551c99
Merge pull request #17105 from nabinhait/gst-category-fieldtype
...
fix: Set GST Category fieldtype as Select in invoice
2019-05-02 12:43:09 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev
2019-05-02 12:01:46 +05:30
Nabin Hait
5a7c5bc4dd
Merge pull request #17435 from rmehta/coa-sorting
...
fix(minor): chart of accounts sorting and message
2019-05-02 11:57:08 +05:30
Saurabh
321c0feed8
Merge branch 'develop' into woocommerce-multilingual-fix-dev
2019-05-02 11:46:53 +05:30
Rushabh Mehta
27a30c842d
fix: simplify sort condition
2019-05-02 09:23:56 +05:30
Nabin Hait
3d64a5da5e
Merge pull request #17416 from asbasawaraj/add_status_field_in_campaign
...
feat: Additional fields in campaign
2019-05-02 03:18:22 +05:30
Nabin Hait
9cce19a65c
Merge pull request #17438 from netchampfaris/cart-route
...
fix(cart): Don't use window.open as it can be blocked
2019-05-02 03:17:58 +05:30
Nabin Hait
c0fdb80486
Merge branch 'develop' into develop_copy_payment_schedule_from_quot_to_SO
2019-05-02 01:00:12 +05:30
Nabin Hait
e93702032b
Merge branch 'develop' into task-depends-on-code
2019-05-02 00:59:23 +05:30
Nabin Hait
bbcf43961c
Merge branch 'develop' into cart-route
2019-05-02 00:59:13 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting
2019-05-02 00:58:56 +05:30
Nabin Hait
d539def25d
Update campaign.json
2019-05-02 00:44:29 +05:30
Nabin Hait
9d04b67f46
fix: Validate parent account of child company while creating new account based on parent company
2019-05-01 20:26:36 +05:30
Nabin Hait
4ee2cec8e2
Merge pull request #17444 from nabinhait/work-order-bom-image-dev
...
feat: Added item image in work order and bom
2019-05-01 19:31:15 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
Nabin Hait
64346c08c6
Merge pull request #17446 from netchampfaris/product-configurator-skip-disabled-items
...
fix: Skip disabled items in product configurator
2019-05-01 19:27:59 +05:30
Nabin Hait
c64cc331b7
Update item_variants_cache.py
2019-05-01 19:27:23 +05:30
Nabin Hait
284e5a284e
Update item_variants_cache.py
2019-05-01 19:26:56 +05:30
Nabin Hait
240008d7c6
fix: Multilingual handling in woocommerce integration
2019-05-01 19:18:40 +05:30
Faris Ansari
4ca948d7ea
fix: Skip disabled items in product configurator
2019-05-01 18:19:24 +05:30
deepeshgarg007
1cfe96193f
Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop
2019-05-01 18:14:07 +05:30
deepeshgarg007
75afff2f6d
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-05-01 18:05:11 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
deepeshgarg007
c5e6886937
feat: Notification for material request receipt
2019-05-01 18:03:40 +05:30
Nabin Hait
621006642c
feat: Added item image in work order and bom
2019-05-01 17:20:21 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
...
fix: Always fetch exchange rate from ref document
2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc
...
fix: Python 3 compatibility fixes
2019-05-01 16:45:11 +05:30
deepeshgarg007
bffa060ff6
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-05-01 16:33:11 +05:30
Nabin Hait
6d9334810e
fix: reverted fetch from as the field does not exists for some ref doctypes
2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0
fix: Always fetch exchange rate from ref document
2019-05-01 15:37:03 +05:30
Nabin Hait
0af45b41d7
Merge pull request #17426 from adityahase/fix-py3-regional-france
...
fix(py3): Undefined variable
2019-05-01 15:05:24 +05:30
Nabin Hait
41423815a7
Merge pull request #17431 from nabinhait/deferred-accounting-long-job-dev
...
fix: moved deferred accounting monthly job to long job
2019-05-01 15:04:12 +05:30
Faris Ansari
358329d7df
fix: Hide button and cart after success
2019-05-01 14:56:50 +05:30
Faris Ansari
5f1eebec16
fix(cart): Don't use window.open as it can be blocked
...
window.open calls are interpreted as popups by some browsers and are
blocked.
Also, route to Quotation web view instead of printview.
2019-05-01 14:32:15 +05:30
Nabin Hait
89b06132cd
minor fix
2019-05-01 14:20:08 +05:30
Nabin Hait
10dae5d3c3
fix: Set GST Category fieldtype as Select in invoice
2019-05-01 14:18:37 +05:30
deepeshgarg007
6dfbd2bb64
fix: Delete old report
2019-05-01 14:17:16 +05:30
deepeshgarg007
db999e293b
fix: Rename Inactive Items report to Inactive Sales Item
2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11
fix(minor): chart of accounts sorting and message
2019-05-01 13:53:05 +05:30
Nabin Hait
cc6ee8e16e
Merge pull request #17154 from nabinhait/item-discount
...
fix: Calculate rate based on discount on server side, only if not rate or pricing rule applied
2019-05-01 13:44:21 +05:30
Nabin Hait
4c724dc3cb
Merge pull request #17428 from nabinhait/ss-fixes-dev
...
Few fixes in payroll
2019-05-01 13:44:05 +05:30
Nabin Hait
991b95fbec
Merge pull request #17434 from nabinhait/payment-entry-exchange-rate-dev1
...
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:35:12 +05:30
Nabin Hait
316c3b3f9d
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:34:17 +05:30
Faris Ansari
7899412d9e
fix: Set depends_on_tasks to Code
...
It tracks a list of dependent tasks which can exceed 140 characters
2019-05-01 13:31:56 +05:30
Nabin Hait
b9b2a06847
moved deferred accounting monthly job to long job
2019-05-01 12:50:23 +05:30
Nabin Hait
b8103ac077
Merge branch 'develop' into item-discount
2019-05-01 12:23:30 +05:30
Nabin Hait
5762a5d8b6
fix: Null handling
2019-05-01 12:17:55 +05:30
Nabin Hait
a08bf7ef86
fix: a few fixes in payroll
2019-05-01 12:17:47 +05:30
Aditya Hase
e7d712934f
Merge branch 'develop' into fix-py3-asset-value-adjustment
2019-05-01 11:55:35 +05:30
Aditya Hase
5bbff9de6c
Merge branch 'develop' into fix-py3-regional-france
2019-05-01 11:55:32 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc
2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c
fix: Python 3 compatibility fixes
...
import reduce from functools
Undefined variable
2019-05-01 11:52:37 +05:30
Aditya Hase
1db334317d
fix(py3): Undefined variable
2019-05-01 11:51:04 +05:30
Aditya Hase
97ad454525
fix(py3): Undefined variable
2019-05-01 11:50:05 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
...
fix: allow_import_of_bank_account_by_account_manager
2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values
...
fix: show only party_type doctypes in Party Type field of bank account
2019-05-01 11:15:02 +05:30
Nabin Hait
7516e7e66e
Merge pull request #17082 from Anurag810/aahi_loan_report
...
feat: Loan repayment report
2019-05-01 11:02:55 +05:30
Nabin Hait
71a07bf022
Update loan_repayment.json
2019-05-01 11:02:35 +05:30
Mangesh-Khairnar
cc8e2b6aca
test: pass filters to execute
2019-05-01 10:03:57 +05:30
Nabin Hait
dff4cce8fd
Merge pull request #17408 from Mangesh-Khairnar/salary-register-fix
...
fix(salary-register): Track doj for non active employee
2019-05-01 09:57:28 +05:30
Karthikeyan S
6b77f6edf3
fix: woocommerce settings patch ( #17422 )
...
(cherry picked from commit 7df8c0ef82d72920aba342623dc10c5c14b1d8f8)
2019-05-01 09:07:44 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts ( #17077 )
...
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
Suraj Shetty
c87b47a575
fix: Price list conversion for other UOM from stock UOM item price ( #17386 )
...
* fix: Price list for UOM other than stock UOM
-Fixes conversion from default UOM item price to other UOMs
* fix: Typo
2019-04-29 23:18:47 +05:30
Faris Ansari
4b21225cf4
fix: Map item_code to title ( #17403 )
...
When making Project from Sales Order, description was mapped
with Task title which can exceed 140 characters easily.
Description should be mapped with description as it is html field.
2019-04-29 22:41:48 +05:30
Faris Ansari
61b4afc3c5
perf: Order by name instead of parent ( #17404 )
...
Changing the order by column reduced the query time from 60s to 12s
2019-04-29 22:41:24 +05:30
Basawaraj Savalagi
d4585efc6a
feat: Additional fields in campaign
2019-04-29 22:12:50 +05:30
deepeshgarg007
36e161df74
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-29 21:44:51 +05:30
deepeshgarg007
f2fb0e03e6
fix: Add status for partial received
2019-04-29 21:42:48 +05:30
Rushabh Mehta
9f660267c1
Merge pull request #17397 from Thunderbottom/manufacturing-demo-fix
...
fix(demo): make demo work again
2019-04-29 15:18:28 +05:30
Rushabh Mehta
1efade3408
fix(task): weight editable
2019-04-29 15:00:20 +05:30
Syed Mujeer Hashmi
b146df6460
feat: Student Group with Student Category filter
...
The Student Category field is added to the Student Group doctype.The
students are fetched from Program Enrollment with added Student Category.
This helps in creating student group based on Program,Batch and Student
Category.Which helps in creating fee schedule with fee structures
defined based on student category.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2019-04-29 13:16:00 +05:30
Aditya Hase
8afeda924d
fix: Use all address lines instead of only first two
2019-04-29 13:09:23 +05:30
Mangesh-Khairnar
513e3f97e5
fix(salary-register): track doj for non active employee
2019-04-29 12:17:49 +05:30
Aditya Hase
ba61be93ae
refactor: Major changes
2019-04-29 06:00:27 +05:30
Aditya Hase
b6e9eb9784
feat(tally): Preprocess and create items and uoms
2019-04-28 19:24:58 +05:30
Aditya Hase
27ab5b540b
fix(tally): Use LEDSTATENAME instead of STATENAME
2019-04-28 19:24:58 +05:30
Aditya Hase
f2202cf638
feat(tally): Preprocess and create parties and addresses
2019-04-28 19:24:58 +05:30
Aditya Hase
0668482f82
feat(tally): Create chart of accounts from tally master data
2019-04-28 19:24:58 +05:30
Aditya Hase
55d465f3ad
feat(tally): Preprocess master data to generate COA
2019-04-28 19:24:58 +05:30
Aditya Hase
9a84a99ac0
feat(tally): Add Tally Migration DocType
2019-04-28 19:24:58 +05:30
Mangesh-Khairnar
96661ba847
feat: add filters for multiple company operation
2019-04-28 17:11:28 +05:30
Chinmay Pai
b503896594
fix(demo): make demo work again
...
definitely not a maga rebranding.
* import erpnext and set default company for accounts
* replace job card start/end date with job card time log
* create a doc for lost_reason
* pass opportunity/quotation lost_reason as a list of dicts
* fix company in stock reconciliation
Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
2019-04-27 01:39:50 +05:30
deepeshgarg007
c23b70950e
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-26 16:43:06 +05:30
Mangesh-Khairnar
9cd9671bb5
fix: minor changes
2019-04-26 16:02:25 +05:30
ashish-greycube
e4e8197f46
codacy review
2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03
fix : allow_import_of_bank_account_by_account_manager
2019-04-26 12:42:14 +05:30
ashish-greycube
4707ad2029
fix: copy_payment_schedule_from_quot_to_SO
2019-04-26 12:14:40 +05:30
rohitwaghchaure
fa626bd3ab
Merge pull request #17372 from rohitwaghchaure/fix_straight_line_asset_depreciation_develop_v12
...
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-26 12:04:32 +05:30
ashish-greycube
467609b193
show only party_type doctypes in Party Type field of bank account
2019-04-26 11:35:04 +05:30
Shivam Mishra
377b230e41
Merge branch 'develop' into lms-fixes-1
2019-04-26 08:42:33 +05:30
Mangesh-Khairnar
da7b1673c3
test: track pi and pr changes
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
869544c0bc
fix: add mapped records as functions
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
438fa620b0
feat: fetch purchase invoice and purchase receipt records for actual cost calculation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
fcd0edf415
test: compare expected data to generated data
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
46b9204e9d
feat: fetch data from budget records for cost estimation
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
5de08f71c5
feat: fetch all required fields from po
2019-04-26 01:31:16 +05:30
Mangesh-Khairnar
69909c0f51
feat: create procurement tracker report
2019-04-26 01:31:16 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po
...
feat: Automatic inter company Sales and Purchase order
2019-04-26 00:24:08 +05:30
