Mangesh-Khairnar
|
ae2a0fb4c7
|
chore: remove unused code
|
2019-08-14 16:50:31 +05:30 |
|
Mangesh-Khairnar
|
3a42631e65
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-08-14 16:11:08 +05:30 |
|
Mangesh-Khairnar
|
107b2768fd
|
refactor: replace raw sql with orm
|
2019-08-14 16:09:16 +05:30 |
|
Mangesh-Khairnar
|
760b078dc9
|
fix(payroll-entry): commit submitted salary slip check on change (#18694)
* fix(payroll-entry): commit submitted salary slip check onchange
* fix: track submitted ss via flags
|
2019-08-14 14:40:00 +05:30 |
|
Deepesh Garg
|
2c5dcbe819
|
fix: Error handling in payment entry (#18720)
|
2019-08-14 14:26:37 +05:30 |
|
Mangesh-Khairnar
|
06ce1f5a40
|
fix(quality-inspection): fetch all items for inspection type in process (#18716)
* fix(quality-inspection): fetch all items for inspection type in process
* fix(quality-inspection): add server side validation for in process items
|
2019-08-14 14:25:59 +05:30 |
|
Deepesh Garg
|
612b0ff9cd
|
Merge pull request #18719 from Anurag810/company_fix_v13
fix: removed hard coded string
|
2019-08-14 12:12:26 +05:30 |
|
Anurag Mishra
|
de20b083a0
|
Merge branch 'develop' into company_fix_v13
|
2019-08-14 12:10:02 +05:30 |
|
Anurag Mishra
|
904cbef4dc
|
fix: removed hard coded string
|
2019-08-13 19:48:42 +05:30 |
|
Sagar Vora
|
33d00bfeae
|
fix: v12 patches sequence (#18610)
|
2019-08-13 19:39:48 +05:30 |
|
rohitwaghchaure
|
4d7a0aaee1
|
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
fix: Check if account passed is accessible under Payment Entry
|
2019-08-13 18:37:17 +05:30 |
|
Mangesh-Khairnar
|
dab5b1f319
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-08-13 13:33:26 +05:30 |
|
Mangesh-Khairnar
|
8b9b77959d
|
fix: fetch min date when carry forward expiry is greater than leave allocation expiry
|
2019-08-13 13:20:10 +05:30 |
|
Anurag Mishra
|
d2f13fe0a6
|
fix: query (#18709)
|
2019-08-13 13:19:24 +05:30 |
|
Suraj Shetty
|
469e430d38
|
Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission
|
2019-08-13 12:12:03 +05:30 |
|
Suraj Shetty
|
64a962ce97
|
fix: Re-organise code
|
2019-08-13 12:10:00 +05:30 |
|
Suraj Shetty
|
1a2600c9ea
|
fix: Ignore account permission check
|
2019-08-13 12:09:06 +05:30 |
|
Himanshu
|
7df50b6ec7
|
fix(QMS): TreeView fixes (#18595)
* fix: TreeView fixes
* test: test case fix
|
2019-08-13 11:58:42 +05:30 |
|
Suraj Shetty
|
80afee04a4
|
fix: Set address while creating Opportunity from Lead (#18702)
* fix: Set address while creating Opportunity from Lead
* fix: Setting of address in opportunity from Lead
|
2019-08-13 10:58:29 +05:30 |
|
Suraj Shetty
|
bd2e7c0e53
|
fix: Comment description
|
2019-08-12 16:32:14 +05:30 |
|
Suraj Shetty
|
3234f0d299
|
fix: Check if account passed is accessible under Payment Entry
|
2019-08-12 16:18:36 +05:30 |
|
Faris Ansari
|
9002a6c195
|
Merge pull request #18353 from surajshetty3416/refactor-call-popup
fix(call popup): Multiple changes
|
2019-08-12 15:56:59 +05:30 |
|
Faris Ansari
|
9eda500dbc
|
Merge branch 'develop' into refactor-call-popup
|
2019-08-12 15:56:35 +05:30 |
|
Frappe PR Bot
|
037caf096b
|
feat: Updated translation (#18597)
|
2019-08-12 15:32:37 +05:30 |
|
Suraj Shetty
|
f81b6c7cfb
|
fix: Set address while creating Opportunity from Lead (#18700)
|
2019-08-12 13:05:22 +05:30 |
|
DeeMysterio
|
1c728a7cf8
|
fix(delivery note): change the text invoice to sales invoice on make button (#18658)
|
2019-08-12 13:04:25 +05:30 |
|
Michelle Alva
|
af969d664f
|
Added Employee Tax Exxxemption category and sub-category links (#18659)
|
2019-08-12 12:59:59 +05:30 |
|
Himanshu
|
ebf38c5ebd
|
fix: misc fixes (#18616)
|
2019-08-12 12:17:16 +05:30 |
|
Andrew McLeod
|
c97ffaeac3
|
fix: Python3 urllib use in item_group.py (now uses six.moves) (#18643)
|
2019-08-12 12:06:30 +05:30 |
|
Shivam Mishra
|
8363a6e585
|
refactor: remove from date and to date from standard filter (#18696)
|
2019-08-12 11:58:14 +05:30 |
|
sahil28297
|
214815eb62
|
fix(patch): force reload child docs (#18672)
|
2019-08-12 11:49:21 +05:30 |
|
Deepesh Garg
|
43dc351209
|
Merge pull request #18692 from deepeshgarg007/gstr-3b-non-gst-develop
fix: GSTR 3B report fixes
|
2019-08-11 19:50:29 +05:30 |
|
deepeshgarg007
|
9db6471fae
|
fix: Test Case
|
2019-08-11 17:29:09 +05:30 |
|
deepeshgarg007
|
4b28b3216b
|
fix: Test Cases
|
2019-08-11 17:28:55 +05:30 |
|
deepeshgarg007
|
c36abbcda3
|
fix: GSTR 3B report fixes
|
2019-08-11 11:01:02 +05:30 |
|
Deepesh Garg
|
e6b076cb34
|
Merge pull request #18632 from netchampfaris/fix-item-template-description-fp
fix(Item Template): Fallback description string
|
2019-08-10 17:33:59 +05:30 |
|
Deepesh Garg
|
0b711d1f8a
|
Merge pull request #18684 from marination/fixes_v12
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
|
2019-08-10 17:26:54 +05:30 |
|
Suraj Shetty
|
3f7a757e80
|
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
|
2019-08-09 19:23:09 +05:30 |
|
Suraj Shetty
|
d4edd284e6
|
fix: Set Contact or Lead for call log
- Set contact or lead to call log on new Contact or Lead creation
|
2019-08-09 19:23:04 +05:30 |
|
Suraj Shetty
|
b282f1f154
|
Merge branch 'develop' into refactor-call-popup
|
2019-08-09 18:18:17 +05:30 |
|
marination
|
4583100537
|
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
|
2019-08-09 15:30:05 +05:30 |
|
Deepesh Garg
|
ca5fdeb9bb
|
Merge pull request #18683 from Mangesh-Khairnar/fix-translation-test
test: Translation in search
|
2019-08-09 15:29:33 +05:30 |
|
rohitwaghchaure
|
208eb05519
|
Merge pull request #18682 from Anurag810/get-item-from-product-bundle-v13
fix: get item from product bundle
|
2019-08-09 15:18:15 +05:30 |
|
Mangesh-Khairnar
|
7c7e9ecfcd
|
test: translation fix
|
2019-08-09 14:48:36 +05:30 |
|
Anurag Mishra
|
8d4b04e719
|
fix: get item from product bundle
|
2019-08-09 14:34:09 +05:30 |
|
Mangesh-Khairnar
|
e173d54054
|
Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management
|
2019-08-09 13:37:51 +05:30 |
|
Mangesh-Khairnar
|
261d132f3a
|
fix: calculate earned leaves based on annual allocation
|
2019-08-09 13:18:52 +05:30 |
|
Mangesh-Khairnar
|
3662ed50d2
|
fix: multiple changes
|
2019-08-08 19:47:17 +05:30 |
|
Suraj Shetty
|
7e818067eb
|
Merge branch 'develop' into refactor-call-popup
|
2019-08-08 19:18:03 +05:30 |
|
Suraj Shetty
|
44b906a43d
|
Merge branch 'refactor-call-popup' of github.com:surajshetty3416/erpnext into refactor-call-popup
|
2019-08-08 19:16:37 +05:30 |
|