Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,627 Commits 3 Branches 0 Tags 1 GiB
21b58ef045
Commit Graph

36627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +05:30
Jannat Patel
d7b139182b
fix: serial no trim issue (#24981) 
* fix: serial no trim issue

* fix: sider
 2021-03-23 21:09:54 +05:30
Jannat Patel
12f0923a61
fix: serial no trim issue (#24949) 
* fix: serial no trim issue

* fix: valid serial nos

* fix: sider

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-03-23 21:09:49 +05:30
Afshan
02142c41bb
fix: validating party currency with doc currency (#24318) 
* fix: validating supplier currency

* fix: compare current currency with company currency as well.

* fix: replaced or with add in condition

* fix: conditioning to get proper payment terms values

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi
f114da2f67
refactor: Make Discharge Schedule Date as Datetime (#24940) 
* refactor: Make Discharge Schedule Date as Datetime

Like Admitted Datetime make discharge date as discharge datetime.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Add patch for renaming discharge_date to discharge_datetime

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: quote style

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-03-23 17:48:25 +05:30
Anupam
940c75f8ac fix: validate_series 2021-03-23 16:54:54 +05:30
Marica
5c7138c86b
Merge pull request #24985 from ankush/allow_zero_valuation_SR_v13b_pr 
fix: Allow zero valuation in stock reconciliation
 2021-03-23 14:58:38 +05:30
Ankush Menat
2ba198576c
fix: set valuation rate for customer items to zero 
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
 2021-03-23 14:03:09 +05:30
Ankush Menat
2a391298a7
test: customer item in stock reconciliation 2021-03-23 14:03:00 +05:30
Ankush Menat
6a534ea82b
fix: Allow zero valuation in stock reconciliation 
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.

Related issue: ISS-20-21-10248
 2021-03-23 14:02:52 +05:30
Marica
23b32381e7
Merge pull request #24888 from ankush/allow_zero_valuation_SR 
fix: Allow zero valuation in stock reconciliation
 2021-03-23 13:58:46 +05:30
Ankush Menat
e76ecb8f74
fix: set valuation rate for customer items to zero 
- In stock reconciliation always set valuation rate of customer provided
items to zero during validation.
- Let user know the valuation has been changed.
 2021-03-23 13:01:21 +05:30
Ankush Menat
714b780868
test: customer item in stock reconciliation 2021-03-23 12:43:02 +05:30
pateljannat
453e07e32a fix: exclude cancelled salary slips 2021-03-23 11:18:57 +05:30
Ankush Menat
762d6e38f7
fix: Allow zero valuation in stock reconciliation 
Stock reconciliation can not be done for customer provided item as they
have zero valuation. This change adds a checkbox in item table to allow
such items.

Related issue: ISS-20-21-10248
 2021-03-23 11:18:04 +05:30
Marica
e6ad39038e
chore: Allow changing Work Stations in WO. (#24897) 2021-03-23 10:46:03 +05:30
Marica
4ccda9f799
chore: Allow changing Work Stations in WO. (#24898) 2021-03-23 10:45:57 +05:30
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload (#24972) 2021-03-23 10:45:20 +05:30
Deepesh Garg
d1f15b2a88
fix: TDS check getting checked after reload (#24973) 2021-03-23 10:45:06 +05:30
Rohit Waghchaure
bde159a77d fix: total weight not set for free items 2021-03-22 23:36:48 +05:30
Deepesh Garg
48d5a65ef5 fix: Add test for pending shortfall update 2021-03-22 21:19:19 +05:30
Deepesh Garg
ea487b6c2e
Revert "fix: GSTR B2C report" 2021-03-22 20:54:07 +05:30
Deepesh Garg
f112ce14cf fix: Pending shortfall update on processing loan security shortfall 2021-03-22 18:33:55 +05:30
Anupam
661b1e59c1 Merge branch 'develop' of https://github.com/frappe/erpnext into planning 2021-03-22 11:48:11 +05:30
Anupam
4980dd616b fix: resolving commits 2021-03-22 11:23:47 +05:30
Anuja Pawar
c7c921495b
fix: payment reference on adding cost center in PE and Issue Summary Report error fixes (#24951) 2021-03-22 11:21:15 +05:30
Rucha Mahabal
dffa647071
fix: membership renewal validation (#24963) (#24964) 2021-03-20 22:24:55 +05:30
Rucha Mahabal
5e1cb5e4bc
fix: membership renewal validation (#24963) 2021-03-20 22:22:01 +05:30
Sagar Vora
a85959f574
fix: remove unwanted parameter in calculate_rate_and_amount (#24883) 
* fix: remove unwanted parameter in calculate_rate_and_amount

* fix: translation syntax
 2021-03-20 16:37:33 +05:30
Walstan Baptista
22054044a3
test: created a new user to test warehouse user perms (#24954) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-20 16:35:14 +05:30
Jannat Patel
08855182a3
test: fix test_loan for payroll module (#24946) 
* test: fix test_loan for payroll module

* fix: minor style changes
 2021-03-19 16:34:14 +05:30
rohitwaghchaure
98a40d81d5
Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre 
fix: revert stock balance value calculation
 2021-03-19 16:22:51 +05:30
rohitwaghchaure
081499c0c0
Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop 
fix: revert stock balance value calculation
 2021-03-19 16:22:13 +05:30
Rohit Waghchaure
67d94ac0cc fix: revert stock balance value calculation 2021-03-19 16:21:30 +05:30
Rohit Waghchaure
f21a55c8ef fix: revert stock balance value calculation 2021-03-19 16:19:34 +05:30
Deepesh Garg
23af1ed372
Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13 
fix: Allow user to update exchange rate in Multi-currency LCV
 2021-03-18 21:21:57 +05:30
Deepesh Garg
b75cbeee4d fix: Allow user to update exchange rate in Multi-currency LCV 2021-03-18 21:20:44 +05:30
Deepesh Garg
9b0a9cc2c0
Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues 
fix: Allow user to update exchange rate in Multi-currency LCV
 2021-03-18 21:20:06 +05:30
Deepesh Garg
adcf9a42bd
Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:51 +05:30
Deepesh Garg
a5de22cb8e
Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
 2021-03-18 21:02:41 +05:30
Walstan Baptista
6df61d217f
test: created a new user to test child perms (#24943) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-18 19:23:59 +05:30
Sagar Vora
6ac11a04b0
test: added warehouse for TCS Item as it is a Stock Item (#24942) 2021-03-18 18:07:21 +05:30
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError (#24941) 2021-03-18 17:45:25 +05:30
Mohammad Hasnain Mohsin Rajan
192ab05869
ci: use ubuntu 18 specifically (#24904) 2021-03-18 17:12:12 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. (#24914) 2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError (#24936) 2021-03-18 16:36:40 +05:30
pateljannat
a2068d9b98 feat: profitability report 2021-03-18 15:25:22 +05:30
Sagar Vora
78e576ee6a
fix: default total_estimated_cost to zero (#24939) 
Co-authored-by: walstanb <walstanb@gmail.com>
 2021-03-18 15:23:52 +05:30
Ankush Menat
c0a9c391eb
fix: hide alt tag if item is not shown in website 2021-03-18 14:07:24 +05:30
Deepesh Garg
d39055785a
Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary 
fix: Report Issue Summary fix for zero issues
 2021-03-18 12:24:43 +05:30