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

28471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rohitwaghchaure
5790fabd54
Merge pull request #18669 from rohitwaghchaure/removed_stock_item_condition_for_sub_contract_v12 
fix: allow to subcontract service raw materials
 2019-08-09 15:18:38 +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
rohitwaghchaure
ed6fb66a90
Merge pull request #18679 from Anurag810/get-item-from-product-bundle 
fix: get item from product bundle
 2019-08-09 15:17:42 +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
Anurag Mishra
24c3b4e00f fix: get item from product bundle 2019-08-09 13:27:59 +05:30
Mangesh-Khairnar
261d132f3a fix: calculate earned leaves based on annual allocation 2019-08-09 13:18:52 +05:30
Himanshu
fa3af74179
Merge pull request #18596 from hrwX/qms-fixes 
fix(QMS): TreeView fixes
 2019-08-09 11:53:23 +05:30
Himanshu
0184c981ee
Merge branch 'version-12-hotfix' into contacts-ref 2019-08-09 11:15:28 +05:30
Suraj Shetty
e047de854b Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list 2019-08-09 11:14:14 +05:30
Himanshu
ffddcb0526
Merge branch 'version-12-hotfix' into qms-fixes 2019-08-09 11:06:36 +05:30
Himanshu Warekar
86f3310ac1 fix: iterate over valid variable 2019-08-09 11:05:04 +05:30
Himanshu Warekar
f94d183297 feat: move to newer contacts structure 2019-08-08 23:50:03 +05:30
Himanshu Warekar
224c2ddaf4 feat: render multiple addresses 2019-08-08 23:34:34 +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
Suraj Shetty
429bfcfd83 fix: Make requested changes 2019-08-08 19:16:32 +05:30
Rohit Waghchaure
10e8073204 fix: allow to subcotract service raw materials 2019-08-08 18:20:53 +05:30
Faris Ansari
99c26e068d fix: Set Maintenance Status fields as Read Only (#18634) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:49 +05:30
Faris Ansari
cfd19afabf fix: Set Maintenance Status fields as Read Only (#18633) 
Maintenance Status is set based on warranty_expiry_date and
amc_expiry_date. Even if they are editable they are set programmatically
server side. Better to make them as read only.
 2019-08-08 17:45:44 +05:30
Mangesh-Khairnar
bafc89f439 refactor: convert raw sql to orm 2019-08-08 17:43:23 +05:30
rohitwaghchaure
9f9184c908 fix: not able to transfer raw materials for subcontracted items (#18650) 2019-08-08 17:41:38 +05:30
rohitwaghchaure
536e6bf57c fix: group by condition in the payment reconciliation (#18657) 2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec fix: accounting period (#18477) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 17:39:13 +05:30
Mangesh-Khairnar
9bc4232af6 feat: calculate remaining leaves both multiple simultaneous allocation 2019-08-08 17:11:08 +05:30
Mangesh-Khairnar
5cbe6160ca feat: consider carry forwarded leaves on creation of encashment 2019-08-08 17:06:15 +05:30
Deepesh Garg
f2bf76a2ef fix: Show Cr or Dr symbol in chart of accounts based on balance (#18653) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035 fix: Show Cr or Dr symbol in chart of accounts based on balance (#18654) 
* fix: Show Cr or Dr symbol in chart of accounts based on balance

* fix: Typo fix in comment
 2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650 fix: Changes in print format due to attribute name changes in frappe (#18639) 2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0 fix: Changes in print format due to attribute name changes in frappe (#18641) 2019-08-08 15:51:50 +05:30
Faris Ansari
df7644a96d fix: Show created serial nos as links in message (#18635) 
Fixes #18623
 2019-08-08 15:50:24 +05:30
Faris Ansari
afae8a0c46 fix: Show created serial nos as links in message (#18636) 
Fixes #18623
 2019-08-08 15:50:17 +05:30
Aditya Hase
472050bb8a fix(quickbooks): Do not build global search for QuickBooks Migrator (#18628) 2019-08-08 15:48:35 +05:30
Aditya Hase
f19b7b9122 fix(quickbooks): Do not build global search for QuickBooks Migrator (#18627) 2019-08-08 15:48:09 +05:30
Mangesh-Khairnar
e5c733bdb3 fix: Accounting period (#18630) 
* fix: accounting period

* test: accounting period

* fix: account period creation

* fix: remove status field from accounting period
 2019-08-08 15:44:11 +05:30