Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,378 Commits 3 Branches 0 Tags 1 GiB
5fdbdd50f9
Commit Graph

25378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohit Waghchaure
2bfb063fdb fix(sales order item): not able to search item by description 2019-03-02 21:47:55 +05:30
Jay Parikh
c2090939d7 Fix Sales Invoice Return Validation "validate_pos" 2019-03-02 12:19:32 +00:00
Rohit Waghchaure
4ef924d0ba fix: on save state code field become blank 2019-03-01 18:11:43 +05:30
Frappe Bot
9ce994a320 Merge branch 'hotfix' 2019-03-01 09:12:25 +00:00
Frappe Bot
3ec0bb7e53 bumped to version 11.1.13 2019-03-01 09:12:25 +00:00
rohitwaghchaure
066da6b1b6
Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix 
fix(regional,italy): bank details, custom button on sales invoice
 2019-03-01 14:26:07 +05:30
rohitwaghchaure
5e71a56c7a
Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate 
fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice
 2019-03-01 14:25:00 +05:30
Gaurav
6a4625b94c fix(regional,italy): codacy fixes in regional sales_invoice js 2019-03-01 13:58:39 +05:30
Gaurav
b30a9b1869 fix(regional,italy): bank details, custom button on sales invoice 
Updates to Bank details in e-invoice XML
Additional fields on Payment Schedule
Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice)
Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py
Updated italian localisation patch line in patches.txt
 2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd
6635583103
fix: Rounding adjustment in Rounded Total 
In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.
 2019-03-01 11:57:06 +05:30
Rohit Waghchaure
c21cda2790 Removed validation for group by voucher in general ledger 2019-02-28 16:20:45 +05:30
Frappe Bot
5d414af86b Merge branch 'hotfix' 2019-02-28 10:08:08 +00:00
Frappe Bot
58135976dd bumped to version 11.1.12 2019-02-28 10:08:08 +00:00
Rohit Waghchaure
ab4ff984c4 fix: scan barcode not adding the barcode value in the items table 2019-02-28 13:31:02 +05:30
rohitwaghchaure
1d41c1c2de
Merge pull request #16787 from rohitwaghchaure/italian_more_fixes 
fix: e-invoicing patch, patch to set country code in the address
 2019-02-28 11:28:04 +05:30
rohitwaghchaure
75e17c664a
Merge pull request #16797 from rohitwaghchaure/cost_update_not_working_for_price_list 
fix: bom cost update is not working
 2019-02-27 20:52:28 +05:30
Rohit Waghchaure
b48effebce fix: test case 2019-02-27 19:33:22 +05:30
Rohit Waghchaure
cd34c70670 fix: bom cost update is not working 2019-02-27 18:01:30 +05:30
Rohit Waghchaure
74cfe57716 fix: e-invoicing patch, patch to set country code in the address 2019-02-27 14:38:36 +05:30
Anurag Mishra
a9a1552e32 refactor 2019-02-27 14:10:24 +05:30
Rushabh Mehta
76f36f68d3
Merge pull request #16790 from crossxcell99/master 
fix: call base class onload method
 2019-02-27 08:31:14 +05:30
crossxcell99
f95171e808 fix: call base clase onload method 2019-02-26 18:01:37 +01:00
Sagar Vora
2ca1f135ef Merge branch 'hotfix' 2019-02-26 17:08:58 +05:30
Sagar Vora
5a14e46a1b bumped to version 11.1.11 2019-02-26 17:28:58 +05:50
Sagar Vora
311a9c79e3
fix: use node v10 for CI 2019-02-26 16:56:37 +05:30
Nabin Hait
39c489bfdc
Merge pull request #16781 from deepeshgarg007/summary 
fix: Make company filter mandatory in sales person wise transaction summary
 2019-02-26 16:00:51 +05:30
Nabin Hait
be5124fe10
Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing 
fix: multiple e-invoicing issues for italy region
 2019-02-26 15:52:56 +05:30
Rohit Waghchaure
0f98cb8b83 fix: multiple e-invoicing issues for italy region 2019-02-26 15:09:27 +05:30
deepeshgarg007
d2d84e3c9d fix: Company filter fix 2019-02-26 11:52:22 +05:30
Sagar Vora
1ca2d47d35
fix: update node to version supported by Yarn (#16772) 2019-02-25 21:10:11 +05:30
Suraj Shetty
5636f924a9 fix: get mode of payment while selecting payment term in payment term template (#16765) 2019-02-25 12:43:34 +05:30
Nabin Hait
9990306399 fix: Consider only active BOMs while updating cost via BOM Update Tool (#16753) 2019-02-25 11:59:05 +05:30
Rushabh Mehta
e2de8e0fa5 fix: expense claim type (#16760) 2019-02-25 11:56:30 +05:30
Suraj Shetty
3ed3332c46
Merge pull request #16726 from deepeshgarg007/bom-item 
fix: Removed duplicate fields from BOM Item
 2019-02-22 10:26:29 +05:30
Suraj Shetty
2dadc1ef98 chore: Remove trailing whitespaces 2019-02-21 20:51:35 +05:30
deepeshgarg007
bf6b36a39b fix: Removed white spaces 2019-02-21 19:30:27 +05:30
deepeshgarg007
56b52d43e6 Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item 2019-02-21 18:30:02 +05:30
Saurabh
539c77c591 Merge branch 'hotfix' 2019-02-21 18:25:28 +05:30
Saurabh
76cd402ca5 bumped to version 11.1.10 2019-02-21 18:55:28 +06:00
Saurabh
e5ff28a92c
Merge pull request #16754 from deepeshgarg007/state_code 
fix: State code issue fix
 2019-02-21 18:21:24 +05:30
Nabin Hait
367d7c104e
Merge pull request #16724 from rohitwaghchaure/user_progress_issue 
fix: user progress issue
 2019-02-21 18:13:52 +05:30
Saurabh
47738f9792
Merge pull request #16750 from nabinhait/cc-against-bs 
fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings
 2019-02-21 18:12:06 +05:30
Nabin Hait
e08cb3a49b
Merge pull request #16745 from nabinhait/manage-returned-qty 
fix: Consider returned qty while making invoice from DN / PR
 2019-02-21 18:11:37 +05:30
Nabin Hait
31f46b313c
Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue 
fix: not able to cancel maintenance visit
 2019-02-21 18:10:46 +05:30
Nabin Hait
e328869b10
Merge pull request #16738 from deepeshgarg007/unique_tree_options 
fix: Filter out unique values for tree options
 2019-02-21 18:09:42 +05:30
Nabin Hait
e3b1b11bc5
Merge pull request #16740 from nabinhait/leave-calendar 
fix: Calendar events for leaves considering user permissions
 2019-02-21 18:08:19 +05:30
Saurabh
a05ccb76f4
Merge pull request #16748 from nabinhait/multi-company-serial-invoicing 
fix: Validate serial no usage in invoice considering multi company transaction
 2019-02-21 18:07:40 +05:30
Nabin Hait
e797ec7463
Merge pull request #16746 from deepeshgarg007/gross_profit 
fix: Decimal point issue in gross profit print
 2019-02-21 18:07:14 +05:30
deepeshgarg007
1915e15a9e fix: State code issue fix in regional module(Italy) 2019-02-21 17:55:57 +05:30
rohitwaghchaure
a49f59fcec
Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero 
(Profit and Loss Statement, fix): for parent account value was showing as zero
 2019-02-21 17:50:51 +05:30