Sahil Khan
|
77ec5cc8d5
|
Merge branch 'version-12-hotfix' into version-12
|
2019-08-13 14:44:18 +05:30 |
|
Sahil Khan
|
f841afd48d
|
bumped to version 12.0.6
|
2019-08-13 15:04:18 +05:50 |
|
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 |
|
Rohit Waghchaure
|
fb23773935
|
fix: reconciled entry has not clearance date set
|
2019-08-12 15:35:19 +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 |
|
DeeMysterio
|
cfce53103b
|
fix(delivery note): change the text invoice to sales invoice on make button (#18666)
|
2019-08-12 13:03:55 +05:30 |
|
Michelle Alva
|
af969d664f
|
Added Employee Tax Exxxemption category and sub-category links (#18659)
|
2019-08-12 12:59:59 +05:30 |
|
Himanshu
|
19199baf29
|
fix: miscellaneous fixes (#18615)
|
2019-08-12 12:17:28 +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 |
|
Andrew McLeod
|
677c522f01
|
fix: Python3 urllib use in item_group.py (now uses six.moves) (#18642)
|
2019-08-12 12:06:23 +05:30 |
|
Shivam Mishra
|
8363a6e585
|
refactor: remove from date and to date from standard filter (#18696)
|
2019-08-12 11:58:14 +05:30 |
|
Suraj Shetty
|
83705af0b3
|
fix: Filters for portal quotation list (#18689)
* fix: Filters for portal quotation list
* fix: Remove unwanted import
|
2019-08-12 11:51:27 +05:30 |
|
sahil28297
|
214815eb62
|
fix(patch): force reload child docs (#18672)
|
2019-08-12 11:49:21 +05:30 |
|
sahil28297
|
a0b9b3cef5
|
fix(patch): force reload child docs (#18671)
|
2019-08-12 11:49:14 +05:30 |
|
Deepesh Garg
|
cd7a89da32
|
Merge pull request #18691 from deepeshgarg007/gstr-3b-non-gst-v12
fix: GSTR 3B report fixes
|
2019-08-11 19:50:44 +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
|
db01743885
|
fix: Test Case
|
2019-08-11 15:47:35 +05:30 |
|
deepeshgarg007
|
b87c5d83de
|
fix: Test Cases
|
2019-08-11 12:40:45 +05:30 |
|
Deepesh Garg
|
8f706399a0
|
Merge pull request #18631 from netchampfaris/fix-item-template-description
fix(Item Template): Fallback description string
|
2019-08-11 11:20:46 +05:30 |
|
deepeshgarg007
|
c36abbcda3
|
fix: GSTR 3B report fixes
|
2019-08-11 11:01:02 +05:30 |
|
deepeshgarg007
|
dabcb6b531
|
fix: GSTR 3B report fixes
|
2019-08-11 10:58:16 +05:30 |
|
Deepesh Garg
|
1fb21cd9e5
|
Merge branch 'version-12-hotfix' into fix-item-template-description
|
2019-08-10 17:36:00 +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
|
7f0f0d0559
|
Merge pull request #18685 from marination/fixes_v12_hotfix
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
|
2019-08-10 17:27:45 +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 |
|
Himanshu Warekar
|
3fbfac64c2
|
Merge contacts-ref into contacts-ref
|
2019-08-09 17:51:14 +05:30 |
|
Himanshu Warekar
|
12fbecf48b
|
fix: use primary label instead of bold letters
|
2019-08-09 17:50:03 +05:30 |
|
Himanshu
|
59a6821299
|
Merge branch 'version-12-hotfix' into contacts-ref
|
2019-08-09 16:52:39 +05:30 |
|
marination
|
9839a9afb0
|
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
|
2019-08-09 15:54:18 +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 |
|