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

27795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deepeshgarg007
84d1e12f34 fix: Typo 2019-07-15 18:42:22 +05:30
deepeshgarg007
8cbc22062b fix: Remove cost center filter from customer credit balance report 2019-07-15 18:35:19 +05:30
deepeshgarg007
ad4c111d91 fix: Remove cost center filter from customer credit balance report 2019-07-15 18:32:10 +05:30
deepeshgarg007
2093ffc15b fix: Usability fixes in accountng dimensions 2019-07-15 18:21:05 +05:30
Nabin Hait
6e264701cb Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items 2019-07-15 18:12:49 +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
Rucha Mahabal
bbb22ad082 fix: child table naming 2019-07-15 17:52:50 +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
sahil28297
96f33cef49
Merge branch 'develop' into quo_opp_address_fix_develop 2019-07-15 15:42:55 +05:30
deepeshgarg007
1cc46c06b0 Merge branch develop into ac_dim_usability_fixes 2019-07-15 15:34:40 +05:30
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
deepeshgarg007
eac5461229 fix: Address filtering fix in opportunity 2019-07-15 13:55:08 +05:30
deepeshgarg007
d5fcab5f81 fix: Set taxes fix for lead 2019-07-15 12:44:11 +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
deepeshgarg007
f7395916c8 fix: Accounting Dimensions in Customer Credit Balance report 2019-07-14 18:44:32 +05:30
deepeshgarg007
a85db66146 fix: Usability fixes in accounting dimensions 2019-07-14 18:15:19 +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
deepeshgarg007
5ea542b08b fix: Do not show Project, Cost Center and Accounting Dimension in ref doc 2019-07-13 11:39:32 +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
Rucha Mahabal
0fe37fda09 codacy fixes 2019-07-12 17:47:32 +05:30
Rucha Mahabal
4879e00d64 codacy fixes 2019-07-12 16:09:32 +05:30
Shivam Mishra
5594ea5298
Merge branch 'develop' into remove-move-stock-summary 2019-07-12 16:04:12 +05:30
karthikeyan5
625ec43fc9 fix(auto attendance): Prevent marking attendance for the ongoing shift 2019-07-12 15:57:37 +05:30
Rucha Mahabal
c35a9a4888 codacy fixes 2019-07-12 15:49:05 +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
Rucha Mahabal
7396bb8933 codacy fixes 2019-07-12 14:47:02 +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
Rucha Mahabal
2b7064a348 codacy fixes 2019-07-12 14:34:43 +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
Rucha Mahabal
9e35bff55c feat: Email Campaign 2019-07-12 13:56:36 +05:30