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
Nabin Hait
5c4b7b32a1
Merge pull request #17373 from netchampfaris/item-attribute-order-dynamic
...
fix: Order Item attribute values dynamically
2019-04-26 00:21:39 +05:30
Nabin Hait
4c31acf5e4
Merge pull request #17382 from nabinhait/tax-exemption-dev
...
refactor: Employee Tax Exemption (develop)
2019-04-26 00:20:46 +05:30
Nabin Hait
ec7a18737b
fix: test cases
2019-04-25 22:30:23 +05:30
Nabin Hait
6adfc5618d
fix: test cases
2019-04-25 21:42:26 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
...
fix: Trial balance finance book issue
2019-04-25 20:34:38 +05:30
Nabin Hait
49446ba760
fix: test cases
2019-04-25 19:54:49 +05:30
Shivam Mishra
9fe7257bfc
fix (ui): refactored breadcrumbs
2019-04-25 19:44:37 +05:30
Shivam Mishra
2428485ebb
fix (ui): Card layout
2019-04-25 19:33:22 +05:30
Shivam Mishra
37a55345fd
feat: removed home page for lms role
2019-04-25 19:29:56 +05:30
Nabin Hait
04e7bf464f
refactor: Employee Tax Exemption
2019-04-25 18:53:39 +05:30
Nabin Hait
e70696e111
Merge branch 'develop' into pos-advance-dev
2019-04-25 17:53:56 +05:30
Rohit Waghchaure
c181064782
fix: Trial balance finance book issue
2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8
fix: Don't allocate advance if pos
2019-04-25 17:49:38 +05:30
deepeshgarg007
ce809d57a2
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 14:29:31 +05:30
deepeshgarg007
f34e4f0e36
fix: Test case for inter-company-transaction
2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Faris Ansari
dd201b0797
fix: Order Item attribute values dynamically
2019-04-25 13:03:50 +05:30
Rohit Waghchaure
9c1fa77f4e
fixed test cases
2019-04-25 11:57:27 +05:30
Rohit Waghchaure
691e03a36b
fix: Straight line asset depreciation not working if Expected Value After Useful Life is defined
2019-04-25 11:57:20 +05:30
Nabin Hait
07e005f963
Merge pull request #17350 from nabinhait/item-tax-patch
...
fix: create account if not exists in item tax patch
2019-04-25 10:40:46 +05:30
Nabin Hait
8784b0b134
Update move_item_tax_to_item_tax_template.py
2019-04-25 10:40:34 +05:30
deepeshgarg007
fef14182b7
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-25 08:27:40 +05:30
Saif Ur Rehman
f1da53ed01
fix(Product Bundle Balance): Remove custom roles
2019-04-25 00:14:14 +05:00
Nabin Hait
2cb57dc3e7
Update move_item_tax_to_item_tax_template.py
2019-04-24 23:34:04 +05:30
Nabin Hait
d828f84da6
Merge pull request #17359 from netchampfaris/item-attribute-order-fix
...
fix: Item Attribute Order
2019-04-24 23:16:34 +05:30
Deepesh Garg
ea9c758648
Merge pull request #17331 from deepeshgarg007/inactive_items
...
feat: Inactive items report
2019-04-24 22:30:54 +05:30
Saif Ur Rehman
a012b63f9b
style: linting
2019-04-24 16:17:40 +05:00
Saif Ur Rehman
adc738f55d
style: linting
2019-04-24 14:43:46 +05:00
Saif Ur Rehman
35887f1c0a
feat: Product Bundle Balance Report
2019-04-24 13:37:25 +05:00
Faris Ansari
90d7150859
Merge branch 'develop' into item-attribute-order-fix
2019-04-24 11:58:27 +05:30
Faris Ansari
cb7ca63979
fix: Item Attribute Order fix
2019-04-24 11:57:40 +05:30
scmmishra
bf7d13a7be
Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2
2019-04-24 09:50:19 +05:30
Nabin Hait
0908907ae1
Merge branch 'develop' into aahi_loan_report
2019-04-24 09:37:52 +05:30
Nabin Hait
43324179d0
Merge pull request #17339 from KanchanChauhan/fix-stock-entry-feed
...
fix: Subject of Stock Entry feed
2019-04-24 09:35:18 +05:30
Nabin Hait
08da372ae5
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-24 09:19:21 +05:30
Nabin Hait
8d3644d826
Merge pull request #17351 from nabinhait/rounded-salary-tax
...
fix: Rounded tax amount in salary slip
2019-04-24 09:19:00 +05:30
Deepesh Garg
719dc506b9
Merge pull request #17352 from nabinhait/pos-advance
...
fix: don't allocate advances if POS
2019-04-24 08:18:05 +05:30
Deepesh Garg
7dddc0c5bf
Merge branch 'develop' into fix-stock-entry-feed
2019-04-24 08:14:10 +05:30
Deepesh Garg
12af1c3837
Merge branch 'develop' into employee-skill-map
2019-04-24 00:03:04 +05:30
Rohan
d12e9426bd
fix(selling): Fix method to also consider return documents ( #17340 )
2019-04-23 23:08:26 +05:30
Nabin Hait
aa028d7856
fix: don't allocate advances if POS
2019-04-23 21:44:21 +05:30
Nabin Hait
c144f66dac
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-23 21:39:33 +05:30
Nabin Hait
90bca999dd
Merge branch 'develop' into inactive_items
2019-04-23 21:39:22 +05:30
Nabin Hait
09438562d4
Merge branch 'develop' into fix-stock-entry-feed
2019-04-23 21:39:04 +05:30
Nabin Hait
80a5cb3dcc
Merge branch 'develop' into item-tax-patch
2019-04-23 21:38:45 +05:30
Nabin Hait
acac41d62b
Merge branch 'develop' into rounded-salary-tax
2019-04-23 21:38:16 +05:30
Nabin Hait
5e0bc20ab8
Merge pull request #17337 from nabinhait/travis-fix-dev
...
fix: Load doc before save
2019-04-23 21:35:18 +05:30
Audacityy
bf8d3658c9
Issue form reorder ( #17346 )
...
* fix: Issue form reorder
2019-04-23 18:55:42 +05:30
Nabin Hait
553a3ea7d2
fix: create account if not exists in item tax patch
2019-04-23 18:46:17 +05:30
Nabin Hait
1f61a1ecf2
minot fix
2019-04-23 18:44:57 +05:30
Nabin Hait
6592a6bcd4
Merge branch 'develop' into income-tax-period-factor-dev
2019-04-23 18:38:54 +05:30
Nabin Hait
8bbc0a0c3b
Merge branch 'develop' into inactive_items
2019-04-23 18:38:44 +05:30
Deepesh Garg
cb2c13fa50
fix: Stock Ledger report fix ( #17343 )
2019-04-23 17:29:59 +05:30
Nabin Hait
24b4a8722e
fix: Rounded tax amount in salary slip
2019-04-23 15:54:32 +05:30
Kanchan Chauhan
253c6f962d
fix: Subject of Stock Entry feed
2019-04-23 14:40:02 +05:30
Nabin Hait
64bfdd9596
fix: test cases
2019-04-23 13:37:19 +05:30
Nabin Hait
593242fa5c
fix: Calculate rate based on discount on server side only if not rate or pricing rule applied
2019-04-23 13:22:38 +05:30
Nabin Hait
319c912f91
fix: Load doc before save
2019-04-23 13:13:36 +05:30
Rushabh Mehta
77b82894ff
fix(style): buttons in address and contact
2019-04-23 07:57:31 +05:30
Suraj Shetty
df59c1573d
feat: Add training date field
2019-04-22 23:35:36 +05:30
deepeshgarg007
e3ea806390
fix: Ignore sql injections
2019-04-22 21:08:29 +05:30
deepeshgarg007
d5e7bf8f0f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-22 21:07:27 +05:30
deepeshgarg007
4f57328924
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-22 20:25:41 +05:30
deepeshgarg007
555f425da1
fix: Test case and styling fixes
2019-04-22 20:24:31 +05:30
Deepesh Garg
2ef7022385
fix: Remove print statements ( #17333 )
2019-04-22 19:25:18 +05:30
scmmishra
936f36ccda
fix: import frappe._ in lms.py
2019-04-22 18:55:19 +05:30
scmmishra
68b3203366
chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment
2019-04-22 18:50:08 +05:30
scmmishra
3673b25b64
fix: quiz is now visible to administrator
2019-04-22 18:10:19 +05:30
deepeshgarg007
d249325d98
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
2019-04-22 18:00:13 +05:30
deepeshgarg007
a89d1df655
fix: Typo fixes
2019-04-22 17:54:38 +05:30
scmmishra
804a74c01c
fix (ui): UI fixes to Video page
2019-04-22 17:52:48 +05:30
scmmishra
6c8f23b27e
fixed (ui): Fixed cards with better buttons
2019-04-22 17:51:30 +05:30
Nabin Hait
7f4e7b63d7
fix: Income tax period factor considering joining and relieving date
2019-04-22 17:39:36 +05:30
deepeshgarg007
bf2adae97d
fix: Ordering and datatype fixes in inactive items report
2019-04-22 17:15:23 +05:30
deepeshgarg007
8a5d556f53
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-22 16:59:33 +05:30
deepeshgarg007
425699d9f2
fix: Material request list_view status fixes
2019-04-22 16:54:52 +05:30
Nabin Hait
af309473f8
Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop
...
fix: moved erpnext related methods from frappe to erpnext(cherry-picked)
2019-04-22 15:59:30 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes
...
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Nabin Hait
28a7aec124
Update accounting.py
2019-04-22 15:35:13 +05:30
deepeshgarg007
6f57b05fed
Merge branch 'develop' of https://github.com/frappe/erpnext into notification
2019-04-22 15:26:55 +05:30
Rushabh Mehta
3bf71cc18e
fix(splash): revert to old image
2019-04-22 15:24:28 +05:30
Deepesh Garg
15a7b7ce71
fix: GSTR 3b report fixes ( #17317 )
...
* fix: GSTR-3b report total taxable value fixes
* fix: Test Cases
2019-04-22 15:22:36 +05:30
scmmishra
5079e6c1c1
chore: minor improvements
2019-04-22 14:48:32 +05:30
scmmishra
ac8d3479c9
feat: Added add_quiz_activity function to course_enrollment class
2019-04-22 14:38:51 +05:30
scmmishra
33969b7d7c
chore: Minor change to question doctype
2019-04-22 14:30:14 +05:30
Rohit Waghchaure
270d4e9f4e
fix: moved erpnext related methods from frappe to erpnext
2019-04-22 14:11:43 +05:30
scmmishra
66d239281c
chore: minor code improvements
2019-04-22 14:10:09 +05:30
Nabin Hait
d3cd98c45e
fix: Renamed depends_on_lwp to depends_on_payment_days
2019-04-22 13:45:45 +05:30
Nabin Hait
452f2c5694
Merge pull request #17322 from nabinhait/salary-structure-child-docstatus
...
Salary structure child docstatus
2019-04-22 13:42:55 +05:30
Nabin Hait
36561801c2
Update set_salary_details_submitable.py
2019-04-22 13:38:06 +05:30
Anurag Mishra
35e52b5596
fix: fixed spelling
2019-04-22 13:37:03 +05:30
Saif Ur Rehman
a216844d2c
fix: Set Allocate Advance Automatically disabled by default
2019-04-22 12:10:40 +05:00
scmmishra
64d2fe0ad7
fix: Minor typo
2019-04-22 12:30:08 +05:30
scmmishra
4add826703
chore: Minor code improvements
...
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
2019-04-22 12:28:13 +05:30
deepeshgarg007
06c20400ee
feat: Track purchase receipt status in Material Request
2019-04-22 12:25:14 +05:30
scmmishra
da2c90cd18
chore: renamed get_program api functions
...
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
2019-04-22 12:21:40 +05:30
scmmishra
9967d27b9a
chore: renamed ambiguous variable names in lms.py
2019-04-22 12:08:41 +05:30
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes ( #17242 )
...
- Rename Server to Jinja
- Rename Js to JS
2019-04-22 12:08:18 +05:30
scmmishra
d78c326f95
chore: renamed get_topic_meta to get_student_topic_details
2019-04-22 12:06:28 +05:30
scmmishra
d5973fe4bc
chore: renamed get_course_meta to get_student_course_details
2019-04-22 12:05:22 +05:30
scmmishra
327334a830
chore: refactor utils.get_current_student
2019-04-22 12:03:17 +05:30
scmmishra
823d89cf66
fix (linting): codacy fixes
2019-04-22 11:46:22 +05:30
Nabin Hait
89d3aaf349
Merge pull request #17310 from nabinhait/ar-fix-develop
...
fix: Total row alignment in AR report
2019-04-22 11:11:38 +05:30
Suraj Shetty
2a9b17efd4
Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map
2019-04-21 23:53:54 +05:30
Suraj Shetty
079684f7da
feat: Task type ( #17311 )
...
* feat: Add task type doctype
2019-04-20 23:37:49 +05:30
Nabin Hait
d21bacfc21
fix: Total row alignment in AR report
2019-04-20 10:58:58 +05:30
Nabin Hait
65b3a849d3
Merge pull request #17306 from surajshetty3416/fix-employee-permission
...
fix: Do not create employee user permission if already exists
2019-04-20 01:44:06 +05:30
Nabin Hait
ee43f9d154
Merge pull request #17305 from nabinhait/inv-disc-fix1
...
fix: fetch party account as discounted receivable account in payment entry
2019-04-20 01:40:55 +05:30
Nabin Hait
d8783343f3
Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop
...
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)
2019-04-20 01:27:31 +05:30
Suraj Shetty
98390dae49
fix: Do not create employee user permission if already exists
2019-04-19 21:52:08 +05:30
Nabin Hait
c8b1351e87
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes
...
fix: Close loan considering latest invoice outstanding balance
2019-04-19 21:27:02 +05:30
Nabin Hait
a6e09826b3
Merge pull request #17297 from netchampfaris/index-item-route
...
fix: Add index to Item route
2019-04-19 20:11:29 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes
...
Invoice discounting fixes
2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd
fix: Close loan considering latest inv outstanding balance
2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7
fix: test cases
2019-04-19 15:10:02 +05:30
Rohit Waghchaure
72cc7508b0
fix: Requested Items To Be Ordered report showing records even if material request is fully ordered
2019-04-19 14:57:38 +05:30
Faris Ansari
1d78aae2af
fix: Add index to Item route
...
Increases route resolve time if there are lots of Items.
2019-04-19 14:03:25 +05:30
Nabin Hait
0aa036cda5
Merge pull request #17294 from scmmishra/trial-detail-fix
...
fix: fixed trial details
2019-04-19 13:18:03 +05:30
Nabin Hait
48e1e04df2
Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop
...
fix: task name was not able to search by name in global search (Cherry-picked)
2019-04-19 13:06:42 +05:30
Prasad R
198c7ae73d
fix: show 2 missing doctypes in Accounts
2019-04-19 12:43:58 +05:30
scmmishra
a55d32236a
fix: fixed trial details
2019-04-19 12:22:30 +05:30
Prasad R
e1a6022c8c
fix: Allow system manager to access share ledger
2019-04-19 10:57:21 +05:30
Rohit Waghchaure
94f43ca2e2
fix: task name was not able to search by name in global search
2019-04-18 22:39:42 +05:30
Rohit Waghchaure
376db4f6b7
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger
2019-04-18 22:06:22 +05:30
deepeshgarg007
c841bd486a
feat: Added validations and mapper to create inter company mapper
2019-04-18 20:10:31 +05:30
deepeshgarg007
90262f84af
feat: Added custom button to make inter company order
2019-04-18 20:09:07 +05:30
deepeshgarg007
100bd29dfd
feat: Updated doctypes for sales and purchase order
2019-04-18 20:08:20 +05:30
Nabin Hait
c99c712913
fix: Validate and update invoice discounting status on JE submit/cancel
2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf
fix: Don't fetch already discounted invoice
2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2
fix: Added invoice discounting dashboard
2019-04-18 14:47:44 +05:30
Suraj Shetty
3aa5e125bd
feat: Add employee training section to the employee skill map
2019-04-18 12:46:33 +05:30
deepeshgarg007
767a00fa8d
feat: Logic for query and report creation for inactive items
2019-04-18 08:45:10 +05:30
deepeshgarg007
4d1df416e9
fix: Reordered and deleted unnecessary filters
2019-04-18 08:29:21 +05:30
Nabin Hait
0050652be9
Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop
...
fix: GSTR-1 B2C Small report fix
2019-04-17 17:32:29 +05:30
Nabin Hait
3a2d6a4043
Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements
...
feat: Production plan enhancements
2019-04-17 17:31:14 +05:30
Nabin Hait
26dd192516
Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop
...
fix: If finance book filter is not set then show all the entries(Cherry-pick)
2019-04-17 17:22:45 +05:30
Shivam Mishra
f3cc87455a
Merge pull request #17249 from scmmishra/auto-fetch-serial
...
feat: Auto fetch serial numbers
2019-04-17 17:15:27 +05:30
Rohit Waghchaure
38238b0cfd
fixed test cases
2019-04-17 15:56:00 +05:30
scmmishra
fed4fd0f02
style: linting issue fixed
2019-04-17 15:46:15 +05:30
Shivam Mishra
63921ebbc9
style: fixed formatting
...
Fixed formatting for for auto_fetch_serial_number
2019-04-17 15:29:29 +05:30
deepeshgarg007
cab2d82ea8
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items
2019-04-17 11:35:56 +05:30
scmmishra
5522cf8c26
fix: codacy linting
2019-04-17 10:26:21 +05:30
Faris Ansari
1cf9fa9662
fix: Refactor Upload Attendance ( #17241 )
...
New API frappe.ui.FileUploader
https://github.com/frappe/frappe/pull/7253
2019-04-17 09:45:46 +05:30
deepeshgarg007
9f873e97fa
fix: Remove print statement
2019-04-16 20:58:22 +05:30
deepeshgarg007
c354a17383
fix: Code cleanup
2019-04-16 20:56:49 +05:30
deepeshgarg007
e5a869bc45
fix: GSTR-1 B2CS report fix
2019-04-16 20:08:12 +05:30
Rohit Waghchaure
7aee809571
fix: If finance book filter is not set then show all the entries
2019-04-16 19:35:18 +05:30
Rohit Waghchaure
00d73cda50
fix: POS not working if user has access of multiple company
2019-04-16 18:43:16 +05:30
Rohit Waghchaure
34ee41a35e
fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items
2019-04-16 18:26:11 +05:30
scmmishra
6d3302b0cc
style (codacy): code formatting fixes
2019-04-16 18:25:53 +05:30
deepeshgarg007
508e815db0
feat: Added filters and columns for inactive items report
2019-04-16 17:07:13 +05:30
scmmishra
ed4b052df8
style (codacy): code formatting fixes
2019-04-16 17:03:25 +05:30
scmmishra
46901076be
feat: Use standard serial picker to add as well as update serial numbers
2019-04-16 17:01:01 +05:30
scmmishra
c791c3b24b
fix: Minor bug in serial no auto fetch api
2019-04-16 16:07:32 +05:30
scmmishra
eee5c38911
feat: Use controller for serial no. API
2019-04-16 15:57:51 +05:30
scmmishra
61d6b677e4
feat: Show standard serial number selector in item grid form
2019-04-16 15:17:27 +05:30
Rushabh Mehta
59c5a16037
fix(account_balance_timeline): remove unused import
2019-04-16 15:11:45 +05:30
scmmishra
407496b528
chore: minor changes to labels
2019-04-16 13:32:41 +05:30
Nabin Hait
0c896c38f8
Merge pull request #17244 from hrwX/delivery_note_fix_v12
...
fix(Delivery Note): show get items even if note has been amended
2019-04-16 13:20:26 +05:30
Himanshu
ef848fda2a
fix: let user delete the elements of items
2019-04-16 13:17:20 +05:30
Nabin Hait
00e9659e3f
Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated
...
Fixed Company Abbr Update Was Not Able To Update Account
2019-04-16 12:51:13 +05:30
scmmishra
19a41ed16d
chore: code cleaning
2019-04-16 12:51:05 +05:30
scmmishra
41cf945247
feat (UX): Refactored batch selector
2019-04-16 12:47:39 +05:30
Nabin Hait
d2044c0f23
Merge pull request #17184 from frappe/akurungadam-patch-1
...
fix: misleading condition example in field options
2019-04-16 12:44:17 +05:30
scmmishra
8ec54c2214
feat: Added auto fetch serial numbers API
2019-04-16 12:20:55 +05:30
scmmishra
b98612ff5b
feat: Added auto fetch logic and button for client
2019-04-16 12:20:42 +05:30
Himanshu Warekar
810dde2e0b
fix: show get items even if note has been amended
2019-04-16 12:20:35 +05:30
Suraj Shetty
006c3dccf9
feat: Add logic to auto fetch skill from designation doc
...
- Set today as default evaluation date
2019-04-16 12:14:44 +05:30
Nabin Hait
b5199951ad
Merge pull request #17239 from nabinhait/pr-pi
...
fix: Invoice against partially returned DN/PR
2019-04-16 11:54:12 +05:30
Rushabh Mehta
1c2eb51a91
fix(api)
2019-04-16 11:12:34 +05:30
Suraj Shetty
354c70a0e7
feat: Init employee skill map doctype
2019-04-16 10:20:32 +05:30
Suraj Shetty
a0f7656ffc
feat: Add skill child table to designation doctype
...
- To record skills required of a particular designation
2019-04-16 10:19:53 +05:30
Nabin Hait
29997e2631
fix: Invoice against partially returned DN/PR
2019-04-16 09:55:42 +05:30
Nabin Hait
c066bbde06
Merge pull request #17235 from hrwX/remove_asset_permission_v12
...
fix(Asset): Remove user permission for employee in asset
2019-04-16 09:45:40 +05:30
Rushabh Mehta
6dff8038e6
fix(account_balance_timeline)
2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d
fix(account_balance_timeline)
2019-04-16 09:33:21 +05:30
Faris Ansari
557520148e
fix: Item Variant Attribute Order ( #17237 )
...
- Show Item Variant Attributes in order they appear in child table
2019-04-15 23:19:44 +05:30
Himanshu Warekar
9b7c7787e6
Merge develop
2019-04-15 22:56:41 +05:30
Himanshu Warekar
3e503f213b
fix: remove user permission for emp in asset
2019-04-15 22:50:22 +05:30
Nabin Hait
a5265113ce
Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix
...
fix(woocommerce integration): 403 error and adding defaults
2019-04-15 21:17:16 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting
...
Invoice Discounting
2019-04-15 21:14:19 +05:30
karthikeyan5
605a0a0570
fix(woocommerce integration): travis fix
...
(cherry picked from commit 2518a2ab169948cff56bfbbedbf7198327b33f25)
2019-04-15 19:47:13 +05:30
karthikeyan5
13563dc495
fix(woocommerce integration): fix strange travis error
...
the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings'
(cherry picked from commit df3e8853aeedb4991e7f8b1c878adb7ba849a063)
2019-04-15 19:47:13 +05:30
karthikeyan5
63f8cda069
fix(woocommerce integration): possible travis fix
...
possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)"
(cherry picked from commit a0b7ff60b8c3303a405c98eac11e71cd556ba166)
2019-04-15 19:47:13 +05:30
karthikeyan5
69f0ce178e
fix(woocommerce integration): error in new-site
...
resolving "Could not find UOM: Nos" error in travis
(cherry picked from commit 97383716e633ae0911238fc02ffc659ad705b41a)
2019-04-15 19:47:13 +05:30
karthikeyan5
307e6a8825
fix(woocommerce integration): defaults in settings
...
(cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)
2019-04-15 19:47:02 +05:30
karthikeyan5
2b0a8de74f
fix(woocommerce integration): fixing 403 error
...
(cherry picked from commit 6784335e2ca3ea8883f08b3d94101f525f37bf1e)
2019-04-15 19:45:38 +05:30
Nabin Hait
076cc38c29
fix: Outstanding amount on making payment against discounted invoice
2019-04-15 18:42:10 +05:30
Rushabh Mehta
6aaac1e9db
fix(assign): do not assign if administrator
2019-04-15 16:58:45 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor
...
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43
Fixed merge conflict
2019-04-15 16:16:25 +05:30
Nabin Hait
fa8f13dc98
Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos
...
fix: POS takes lot of time to load the items data
2019-04-15 10:11:31 +05:30
Nabin Hait
6ecc83aaf0
Merge pull request #17182 from hrwX/revert_salary_slip
...
Revert(Salary Slip): Wrong Formula
2019-04-15 10:08:53 +05:30
Nabin Hait
e7e2e93419
Merge pull request #17183 from netchampfaris/duplicate-variant-check-d
...
fix: Validate variant attributes only if is_new
2019-04-15 10:08:28 +05:30
Nabin Hait
8ab393448f
Merge pull request #17218 from netchampfaris/item-price-packing-unit-d
...
fix: Set default value for Packing Unit as 0
2019-04-15 10:06:45 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix
...
fix: handle for party type member in payment entry (v12)
2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
...
feat: Added bank account no in bank reconcilliation
2019-04-14 16:10:19 +05:30
scmmishra
5b9df676a4
fix: minor bug in breadcrumb routing
2019-04-13 18:53:49 +05:30
