Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,711 Commits 3 Branches 0 Tags 1 GiB
8dbc4e648b
Commit Graph

30711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
7845961d46
Merge pull request #21017 from Alchez/dev-remove-same-item-validation 
feat: allow BOM to use same item as raw material (develop)
 2020-03-31 16:04:26 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor 2020-03-31 15:59:22 +05:30
Saurabh
84b93414d0 fix: typo 2020-03-31 15:58:00 +05:30
Saurabh
6c8d63f3b9 fix: provision to setup new address from lead if address creation break due to mandatory exception 2020-03-31 15:58:00 +05:30
Saurabh
e567563aa1 fix: if mandatory fields are missing do not create address against lead 2020-03-31 15:58:00 +05:30
rohitwaghchaure
bc415331a2
Merge pull request #21003 from Alchez/dev-stock-entry-fg-validation 
fix: allow target warehouses to be changed for work order stock entries (develop)
 2020-03-31 15:44:13 +05:30
Saqib
25846cccbd
fix: warehouse_account_map not getting reset for diff company transac (#20995) 
* fix: warehouse_account_map not getting reset for diff company transaction

* fix: potential key errors while fetching warehouse_account_map

* fix: travis

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 15:31:15 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue 
fix: Adding proper error message
 2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups (#21070) 2020-03-31 15:28:45 +05:30
rohitwaghchaure
d274923ae1
fix: "Qty To Manufacture" field as non mandatory in job card (#21081) 2020-03-31 15:28:31 +05:30
rohitwaghchaure
86aff0de1f
fix: serial no scan not adding the serial nos in stock entry (#21083) 2020-03-31 15:26:45 +05:30
Deepesh Garg
242a079bcb Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_blanket_order 2020-03-31 14:18:30 +05:30
Deepesh Garg
4d9fe69ba5 fix: Test cases 2020-03-31 14:17:53 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue 2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal (#21084) 
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
 2020-03-31 10:51:09 +05:30
Saqib
bba78f0384
fix: auto created asset message (#21108) 
* fix: auto created asset message

* Update erpnext/controllers/buying_controller.py

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-03-31 10:49:44 +05:30
Deepesh Garg
fbf6e56d86
fix: Expense account currency validation in Landed Cost voucher (#21073) 
* fix: Expense account currency validation in Landed Cost voucher

* fix: Remove unused imports
 2020-03-31 10:45:32 +05:30
Andy Zhu
5c54adec28
fix: docfield of sales_order is not fetching route options for new doc (#21123) 
Using the wrong method to get `so` as docfield.
frappe.meta changes will not effect the `sales_order` in `frm`.
 2020-03-31 10:43:00 +05:30
prafful1234
3fa03df1e3
fix(transaction): Add comment-by from frappe session (#20867) 
Co-authored-by: prafful1234 <prafful@mntechnique.com>
 2020-03-31 10:40:42 +05:30
Raffael Meyer
b0ab3981ea
fix(regional): header row in DATEV report (#21113) 
* fix(regional): encoding of DATEV report

* feat(regional): filter datev report by voucher type

* fix: creation time, coa used, is frozen

* add voucher types: Payroll Entry, Bank Reconciliation, Asset, Stock Entry

* fix indentation

* fix indentation

* fix indentation
 2020-03-31 10:40:03 +05:30
Ahmad M Abdelrahman
06b3f6f781
Remove Campagin restrection (#21024) 
Lead Source Now is an independent doctype.
forcing the user to add Campaign is not valid 
Solution
Show Campaign keeping it optional and keep the user to be free to add or remove data
 2020-03-31 10:38:49 +05:30
Deepesh Garg
cc4753977f
Merge branch 'develop' into po_supplier_skip 2020-03-31 10:37:21 +05:30
Shivam Mishra
7806e5a052
feat: changes for desk pages (#21027) 
* feat: rename Chart on Getting Started Page

* feat: add dashboard and leaderboard to getting started

* feat: remove communication

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2020-03-31 10:30:20 +05:30
Deepesh Garg
007548b79c
fix: Bank Account patch (#21124) 2020-03-31 10:07:51 +05:30
Deepesh Garg
c014c802dd fix: Remove comments 2020-03-30 22:50:29 +05:30
Deepesh Garg
c33412b6ae feat: Link blanket order and quotation 2020-03-30 22:44:13 +05:30
Shivam Mishra
3a2c8560ba feat: update desk page for Non Profits 2020-03-30 18:15:51 +05:30
Shivam Mishra
28fafd0dda feat: setup subscription API 2020-03-30 18:15:37 +05:30
Shivam Mishra
1281634306 feat: client code to handle razorpay fields 2020-03-30 18:15:22 +05:30
Shivam Mishra
1d6395c5cf feat: add PAN details field to member for India 2020-03-30 18:14:44 +05:30
Shivam Mishra
e836cdec13 feat: update member and membership doctype 2020-03-30 18:14:10 +05:30
Shivam Mishra
1f20f6348d feat: added membership settings doctype 2020-03-30 18:13:29 +05:30
Deepesh Garg
f0760dee80 Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue 2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2 fix: Test cases 2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip 2020-03-30 13:07:03 +05:30
Deepesh Garg
647529651d
Merge pull request #21067 from Alchez/dev-add-issue-status-filter 
feat: add status filter in issue web form (develop)
 2020-03-30 12:23:20 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop 
fix: not able to add equity account in the chart of accounts
 2020-03-30 12:15:01 +05:30
Deepesh Garg
a47e42c515
Merge pull request #21087 from nabinhait/item_defaults_fix_dev 
fix: Add item defaults based on global settings only if default company and warehouse is mentioned
 2020-03-29 21:55:25 +05:30
Deepesh Garg
fe1f754d83
Merge pull request #21110 from nextchamp-saqib/cancel-error-hyperlink 
chore: hyperlinks in cannot cancel message
 2020-03-29 21:53:43 +05:30
Deepesh Garg
e0a4a32460
Merge pull request #21115 from nextchamp-saqib/course-report-perm-fix 
fix: cannot view report for course doctype - permission problem
 2020-03-29 21:51:15 +05:30
Rohit Waghchaure
cdf80eb4ad fix: not able to add equity account in the chart of accounts 2020-03-29 16:35:10 +05:30
Saqib Ansari
0f6d372182 fix: cannot view report for course doctype - permission problem 2020-03-29 12:52:16 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix 
fix: total currency formatting in Acc Receivable and Payable
 2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed 2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message 2020-03-28 21:17:58 +05:30
Deepesh Garg
f9f39f5a7e
Merge pull request #21103 from nextchamp-saqib/stock-ledger-warehouse-filter 
chore: [ux] filter warehouse based on company
 2020-03-28 21:09:46 +05:30
Saqib Ansari
b345fe0fe9 chore: hyperlinks in cannot cancel message 2020-03-28 20:11:26 +05:30
Saqib Ansari
ed3553f795 chore: [ux] filter warehouse based on company 2020-03-28 19:12:59 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix 
fix: currency formatting in gl entry dr cr field
 2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1 fix: currency formatting in gl entry dr cr field 2020-03-28 16:39:22 +05:30