Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,661 Commits 3 Branches 0 Tags 1 GiB
2ab9947647
Commit Graph

27661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Govind S Menokee
2ab9947647
Merge branch 'develop' into batch_bom_operations 2019-07-16 02:12:24 +05:30
Govind S Menokee
7d9d027bfe feat: update modified to fetch latest state in patches 2019-07-16 02:01:27 +05:30
Govind S Menokee
90fc3aff72 feat: add patch for default batch_size for old records 2019-07-16 01:48:35 +05:30
rohitwaghchaure
e9f0e88f9b fix: taxes sequence if shipping rule is set in the sales invoice (#18329) 2019-07-15 18:57:25 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements 
fix: set invoice status considering invoice discounting
 2019-07-15 18:53:30 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields (#17788) 
* refact: Refactored over delivery/receipt/billing fields

* fix: test case
 2019-07-15 18:02:58 +05:30
sahil28297
39c3cfa25d fix(hr_setting): fix translation method call (#18328) 2019-07-15 11:25:26 +00:00
sahil28297
7697066cc2 fix(sales_order_list): compare type as well (#18331) 
* fix(sales_order_list): compare type as well

* fix(sales_order_list): compare type as well
 2019-07-15 11:25:06 +00:00
sahil28297
ec810a4a55 fix(product_page): compare type as well and provide base class for parseInt (#18332) 2019-07-15 11:24:41 +00:00
Faris Ansari
1abd1e79a9 fix: Module Links (#18318) 
* fix: Add Project Billing Summary link

* fix: Bank Guarantee shouldn't depend on Bank Guarantee
 2019-07-15 14:34:10 +05:30
Faris Ansari
280fe396b9 fix: Dont rebuild cache on cache bust (#18319) 
- Results in a lot of stale background jobs
- Cache will be built when needed
 2019-07-15 14:30:21 +05:30
Anurag Mishra
e37ff39836 fix: Validate loan repayment amount in Loan Application (#18169) 
* fix: validate loan repayment amount

* fix: test for loan application
 2019-07-15 14:16:52 +05:30
Mangesh-Khairnar
1ac9a8e82e fix(bin): update requested qty in bin (#18297) 2019-07-15 14:08:47 +05:30
Himanshu
94a0d45b77 fix: do not add an extra day (#18311) 2019-07-15 14:06:50 +05:30
Michelle Alva
6abb63b445 refactor: Refactor module links of Accounting, HR, Project (#18160) 2019-07-15 14:00:00 +05:30
Nabin Hait
d83e39d0ac Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements 2019-07-15 13:56:29 +05:30
Nabin Hait
5435b7e9eb fix: Null issue 2019-07-15 13:56:09 +05:30
Govind S Menokee
14ec76e8d9 feat: remove is_batch_operation from select query 2019-07-14 23:06:10 +05:30
Govind S Menokee
5965469abd feat: remove is_batch_operation checkbox from work order operation 2019-07-14 23:02:33 +05:30
Govind S Menokee
f3e10a489d feat: remove check box for batch operation 2019-07-14 22:55:12 +05:30
rohitwaghchaure
3643d67249
Merge pull request #18023 from fproldan/fix_by_voucher_order_develop 
fix: General Ledger Group by Voucher not ordering by posting_date for develop
 2019-07-14 17:23:54 +05:30
rohitwaghchaure
f414c8945f
Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree 
fix: Dr / Cr label for balance of the ledgers in the account tree
 2019-07-14 17:00:58 +05:30
Himanshu
b395daf76c
Merge pull request #18307 from hrwX/stat-fix 
fix(Quality): miscellaneous fixes
 2019-07-13 18:13:16 +00:00
Himanshu Warekar
dc02f4d07d fix: miscellaneous fixes 2019-07-13 20:00:25 +05:30
Deepesh Garg
74e0f2cbae
Merge pull request #18293 from nabinhait/taxes-calc-only-if-items-dev 
fix: Calculate taxes and totals only if items added in transaction
 2019-07-12 23:03:12 +05:30
Aditya Hase
7be89f232c
fix(auto attendance): Prevent marking attendance for the ongoi… (#18298) 
fix(auto attendance): Prevent marking attendance for the ongoing shift
 2019-07-12 21:38:59 +05:30
karthikeyan5
625ec43fc9 fix(auto attendance): Prevent marking attendance for the ongoing shift 2019-07-12 15:57:37 +05:30
Rohit Waghchaure
8412f847d4 fix: dr / cr label for balance of the ledgers in the account tree 2019-07-12 15:44:58 +05:30
Deepesh Garg
397013ec92 fix: Fix for customer lead merging in Quotation (#18294) 2019-07-12 14:51:01 +05:30
Deepesh Garg
ed9ac14f70 fix: Usability fixes for chart of Accounts Importer (#18285) 
* fix: Usablity fixes for chart of Accounts Importer

* fix: Provide Row no with error messages
 2019-07-12 14:47:00 +05:30
Deepesh Garg
d73426a3bc fix: Add status field at parent level in quality inspection and minor UX fix (#18263) 
* fix: Add status field at parent level and minor UX fix

* fix: Set default status as Accepted
 2019-07-12 14:44:22 +05:30
Nabin Hait
b315acb5a7 fix: Calculate taxes and totals only if items added in transaction 2019-07-12 14:32:53 +05:30
Anurag Mishra
70dbca2263 fix: enable track changes for issue doctype (#18290) 2019-07-12 14:29:20 +05:30
Deepesh Garg
f9e4391998
Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop 
feat: "Order Type" tree type for Sales Analytics report (develop)
 2019-07-12 14:28:16 +05:30
Deepesh Garg
49c97922b4
Merge pull request #18189 from bhavishyasharma/feat-manufacturer-is-missing-contacts 
feat: Manufacturer is Missing Contacts
 2019-07-12 14:01:00 +05:30
Rushabh Mehta
64897d26a4 fix(minor): open colour status for issue 2019-07-12 12:55:28 +05:30
Deepesh Garg
587bdf09eb
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 12:30:42 +05:30
Deepesh Garg
f7c151e7ba
Merge pull request #18241 from scmmishra/cash-flow-chart 
feat: added chart to cash-flow report
 2019-07-12 12:30:18 +05:30
Jamsheer
5073ac4dcb fix: Patient History (Patient Medical Record) (#17972) 
* Page - Patient History

* Healthcare Utils - get patient vitals

* Healthcare Utils - render doc as html for patient history page

* Page - Patient History -  prcatitioner image in time line

* Page - Patient History in menu

* fix - page medical history

* fix: page patient_history broken img, minor fixes

* fix: patient_history page, add pagination, show doc if fetched

* fix: Patient Medical Record to Patient History

* fix: patient history page - set route options

* fix: update to code standards

* fix: remove Eidt button form patient history

* fix: css update to code standards

* fix: Remove page medical_record
 2019-07-12 12:28:34 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency 2019-07-12 12:24:05 +05:30
Himanshu
7d1d9aa46b feat(Issue): Reset SLA (#18244) 
* feat: reset sla

* fix: db.get_single_value

* feat: timeline entry for reset sla

* fix: remove communication from support config

* fix: reset sla on split_issue
 2019-07-12 12:19:35 +05:30
Anurag Mishra
53e7df078e fix: set project link in item tables (#18233) 2019-07-12 12:05:39 +05:30
rohitwaghchaure
9b34eab93a
Merge pull request #18258 from Mangesh-Khairnar/purchase-order-tax-category 
feat(purchase-order): Add tax category field in purchase order
 2019-07-12 11:39:35 +05:30
Saurabh
acaf76a6de
Merge branch 'develop' into feat-manufacturer-is-missing-contacts 2019-07-12 11:10:12 +05:30
Saurabh
98d429d271
Merge pull request #18239 from netchampfaris/breadcrumbs-module-map-2 
fix: Add module map for breadcrumbs
 2019-07-12 11:09:20 +05:30
Deepesh Garg
abd4a7a950
Merge pull request #18253 from frappe/jigneshpshah-Report-link 
fix: navigation link updated for Item Shortage Report
 2019-07-11 22:22:54 +05:30
Aditya Hase
d02c8ad898
fix: Quickbooks Migrator (#18259) 
fix: Quickbooks Migrator
 2019-07-11 20:27:00 +05:30
Aditya Hase
f04b19aa2e fix: Company might not have any warehouses when on_update hook for QBM is being executed 
This used to throw while renaming a Company that is either used with QuickBooks
Migrator or is set as a Default Company in Global Defaults.
 2019-07-11 18:29:24 +05:30
Mangesh-Khairnar
f8c92f30bf feat(purchase-order): Add tax category field in purchase order 2019-07-11 18:27:49 +05:30
Aditya Hase
d4c10801d1 style: Remove multiple whitespace after : 2019-07-11 18:17:01 +05:30