Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,884 Commits 3 Branches 0 Tags 1 GiB
beba79c420
Commit Graph

18449 Commits

Author SHA1 Message Date
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
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
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
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
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
Himanshu Warekar
c4fe98391b fix: set now_datetime 2019-05-11 09:38:08 +05:30
Himanshu Warekar
a8f9698082 fix: call the correct function 2019-05-11 00:01:43 +05:30
Himanshu Warekar
6e6148be39 fix: calculate variance 2019-05-10 23:49:42 +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
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
Himanshu Warekar
488432c0e8 fix: display sla status 2019-05-09 11:50:09 +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
Himanshu Warekar
5aba75d74d fix: show priority change dialog 2019-05-08 00:22:26 +05:30
Himanshu Warekar
91478181cb Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-07 23:43:06 +05:30
Himanshu Warekar
fc3232a9db fix: compare timedeltas directly 2019-05-07 23:42:38 +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
Himanshu Warekar
1bfef6a600 fix: code fixes 2019-05-07 10:46:52 +05:30
Himanshu Warekar
9563835b61 fix: miscellaneous fixes 2019-05-07 10:40:02 +05:30
Himanshu Warekar
cf37e401f8 fix: change agreement status only if ongoing 2019-05-07 10:27:01 +05:30
Himanshu Warekar
c5999154e6 fix: test cases and use orm 2019-05-06 23:43:16 +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
Himanshu Warekar
aa0eaab3df fix: codacy 2019-05-06 01:35:11 +05:30
Himanshu Warekar
785f98efd9 minor: change autoname for sla 2019-05-06 00:43:38 +05:30
Himanshu Warekar
9faaa17d9d patch: fixes 2019-05-05 23:55:17 +05:30
Himanshu Warekar
f8b9c849a1 fix: test cases for sla 2019-05-05 22:51:18 +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 Warekar
fbb7ea4856 fix: patch fix 2019-05-05 17:21:38 +05:30
Himanshu Warekar
134ad61604 fix: patch fixes 2019-05-05 16:26:11 +05:30
Himanshu Warekar
917e534191 patch: fix to migrate to new sla structure 2019-05-05 14:43:11 +05:30
Himanshu Warekar
e9b159c500 Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix 2019-05-05 12:45:50 +05:30
Himanshu Warekar
ec54e3d831 patch: migrate to new sla structure 2019-05-05 12:31:04 +05:30
Himanshu Warekar
b3070ca765 fix: display sla indicators at the top 2019-05-05 12:19:08 +05:30
Himanshu Warekar
898ab61dd4 fix: Child table for priority 2019-05-04 23:16:02 +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
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