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 |
|
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 |
|
Rushabh Mehta
|
249d47cd1c
|
fix(readme): logo URL
|
2019-05-18 10:53:01 +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 |
|
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 |
|
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 |
|
Anurag Mishra
|
15e2546846
|
Merge branch 'develop' into bom_items_and_scraps
|
2019-05-16 18:24:04 +05:30 |
|
Anurag Mishra
|
dd5d4c49c4
|
fix: indent
|
2019-05-16 17:08:44 +05:30 |
|
rohitwaghchaure
|
cca5c45ebd
|
Merge pull request #17638 from rohitwaghchaure/changed_fieldtype_from_data_to_float
fix: changed fieldtype from data to float
|
2019-05-16 17:04:51 +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 |
|
rohitwaghchaure
|
dbecd9d45e
|
Merge pull request #17476 from Anurag810/subs
feat: subcontracting report
|
2019-05-16 14:06:44 +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 |
|
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 |
|
sahil28297
|
adf6dcd74a
|
Merge pull request #17603 from netchampfaris/fix-v12-setup
fix: Clear messages during setup fixtures
|
2019-05-14 20:11:38 +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 |
|
Deepesh Garg
|
1f02fcdf89
|
Merge pull request #17597 from deepeshgarg007/territory_group_fixes_develop
fix: Make territory filter mandatory
|
2019-05-14 14:37:39 +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
|
bbdd737b5c
|
Merge pull request #17590 from deepeshgarg007/inactive_items_row_develop
fix: Do not append row if item is sold within days since last ordered
|
2019-05-14 11:56:59 +05:30 |
|