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 |
|
deepeshgarg007
|
d249325d98
|
Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po
|
2019-04-22 18:00:13 +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 |
|
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 |
|
Rohit Waghchaure
|
270d4e9f4e
|
fix: moved erpnext related methods from frappe to erpnext
|
2019-04-22 14:11:43 +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 |
|
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 |
|
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
|
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 |
|
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 |
|