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

34847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hussain Nagaria
b7f2ba1556 feat: Add Report boilerplate 2021-03-30 12:19:16 +05:30
Sagar Vora
ba76f87e44
fix(Italy): setup, validations, optimisations (#25054) 
* fix(Italy): setup, validations, optimisations

* fix: remove unused import
 2021-03-29 20:18:45 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError (#25044) 2021-03-27 20:30:26 +05:30
Walstan Baptista
ee822a9dcd
test: use different product attribute value; cleanup (#25043) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-03-27 19:42:25 +05:30
Walstan Baptista
d6c7d8e631
test: reset session user if test errors in test_sle (#25042) 2021-03-27 18:30:07 +05:30
Sagar Vora
868c0bf45b
perf: reduce no of queries for checking if future sl entry exists (#24881) 2021-03-27 16:10:20 +05:30
walstanb
ab673d9e4b fix: minor changes 2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad test: sets is_purchase_item while item creation 2021-03-27 12:54:49 +05:30
walstanb
52403c537b fix: check if gst account exists before appending 2021-03-27 12:54:49 +05:30
walstanb
9826ac4602 test: reset session user if test errors 2021-03-27 12:54:49 +05:30
walstanb
98dcf8a1fd fix: type casting for None type value 2021-03-27 12:54:49 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule 
feat: recursive pricing rule
 2021-03-26 19:10:10 +05:30
rohitwaghchaure
86628ea287
Merge pull request #25025 from ruchamahabal/production-raw-material-enhancements 
feat(Production Plan): Enhancements in Material Request Plan Item
 2021-03-26 18:59:23 +05:30
Rucha Mahabal
87a70fe8cb feat: Show Required Qty as per BOM in Material Request Items 2021-03-26 18:37:50 +05:30
Rucha Mahabal
9dbabb92df feat: Add more fields to raw material download 2021-03-26 18:37:40 +05:30
Rucha Mahabal
07409990a0 fix: Ordered and Reserved Qty for Production not getting fetched in Items 2021-03-26 18:37:24 +05:30
Rucha Mahabal
1f86471656 feat: show ordered and reserved qty in Material Request Plan Item table 2021-03-26 18:36:52 +05:30
Rucha Mahabal
66bae19c16 feat(Production Plan): Consider Safety Stock in Required Qty Calculation 2021-03-26 18:36:33 +05:30
Prssanna Desai
1bbd5c98d3
Merge pull request #24996 from prssanna/help-links-fix 2021-03-26 16:04:25 +05:30
Prssanna Desai
3da2df55f4
Merge branch 'develop' into help-links-fix 2021-03-26 15:35:17 +05:30
Sagar Vora
0b569b3e43
fix: allow creating stock entry based on work order for customer provided items (#24885) 2021-03-26 14:40:15 +05:30
prssanna
dd2a315d06 style: fix formatting 2021-03-26 14:35:47 +05:30
Marica
ffb4e3f280
Merge pull request #24937 from ankush/hide_alt_field 
fix: hide alt tag if item is not shown in website
 2021-03-25 20:14:52 +05:30
Anurag Mishra
344c14c9ca
Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip 
fix(Payroll): Exchange Rate not getting set in Salary Slip
 2021-03-25 18:12:11 +05:30
Deepesh Garg
74200bcd62
Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue 
Revert "fix: GSTR B2C report"
 2021-03-25 16:50:10 +05:30
Deepesh Garg
7b8742bd70
Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party 
Revert "fix: validating party currency with doc currency"
 2021-03-25 16:49:50 +05:30
Rucha Mahabal
b2b12f303e fix(Payroll): Exchange Rate not getting set in Salary Slip 2021-03-25 14:48:08 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies (#24988) 2021-03-25 12:56:33 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field 2021-03-25 12:15:58 +05:30
Syed Mujeer Hashmi
f8b44e05c4
refactor: Add student mobile number to student attendance (#24990) 
To setup SMS alert notification for student attendance we need student mobile
number in this doctype.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
 2021-03-25 11:48:29 +05:30
Anupam Kumar
b4e842e25e
fix: opportunity-quotation mapping order status (#25001) 2021-03-25 11:45:57 +05:30
Deepesh Garg
1a6e6320cf Revert "fix: validating party currency with doc currency (#24318)" 
This reverts commit 02142c41bb.
 2021-03-24 21:26:04 +05:30
Prssanna Desai
8a87ffc8f6
fix: POS print receipt (#24924) 
* fix: POS print receipt

* fix: print recepit dialog
 2021-03-24 19:52:39 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice (#24917) 2021-03-24 17:56:24 +05:30
prssanna
194dd12882 fix: re-execute add_standard_navbar_items patch 
- check that same items aren't appended again
 2021-03-24 16:45:32 +05:30
prssanna
97aab3ac21 fix: missing help links in navbar help dropdown 2021-03-24 16:44:49 +05:30
rohitwaghchaure
575f8f226b
fix: repost not completed backdated transactions (#24980) 2021-03-24 11:30:53 +05:30
Deepesh Garg
734f5c2533
Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update 
fix: Pending shortfall update  on processing loan security shortfall
 2021-03-24 11:24:49 +05:30
Anupam Kumar
5ce0569f80
fix: validate_series (#24984) 2021-03-23 21:13:41 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report (#24982) 2021-03-23 21:11:01 +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
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
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
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload (#24972) 2021-03-23 10:45:20 +05:30
Rohit Waghchaure
bde159a77d fix: total weight not set for free items 2021-03-22 23:36:48 +05:30