Deepesh Garg
5d73d8281b
fix: Remove unintentionally added field
2021-03-31 14:10:56 +05:30
Deepesh Garg
f54d596ae1
fix: Precision issues while allocating advance amoount
2021-03-31 14:06:02 +05:30
rohitwaghchaure
83b3e87497
Merge pull request #25076 from rohitwaghchaure/fixed-bom-stock-calculated-report
...
fix: bom stock calculated report
2021-03-31 13:51:32 +05:30
Afshan
b07de03ddb
fix: added blank option for status in report related to issue
2021-03-31 13:39:04 +05:30
marination
59bff8a2f1
fix: Test
...
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
2021-03-31 13:17:25 +05:30
marination
1b903e39c8
fix: Sider (unused variables)
2021-03-31 13:17:13 +05:30
marination
1999ae0a91
fix: PO not created against all selected suppliers (drop shipping)
...
- Return list of created POs instead of first doc
- test case added
2021-03-31 13:17:00 +05:30
Hussain Nagaria
39b75c63ad
feat: Add chart generation
2021-03-31 13:13:25 +05:30
Marica
5a601ce851
Merge branch 'develop' into drop-shipping
2021-03-31 13:12:13 +05:30
Sagar Vora
e50324aed7
perf: reduce number of queries for checking if future SL entry exists ( #25064 )
2021-03-31 12:44:03 +05:30
Sagar Vora
368cb45147
fix(Italy): setup, validations, optimisations ( #25065 )
2021-03-31 12:43:33 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Marica
14c44e5e9e
Merge branch 'develop' into drop-shipping
2021-03-31 12:27:32 +05:30
marination
120da991d0
fix: Test
...
- Preserve order of supplier list while removing duplicates
- Dont use list of set, but list of dict with unique keys
2021-03-31 12:27:57 +05:30
Hussain Nagaria
92c768972f
fix: Missing quotation marks in SQL query
2021-03-31 12:26:37 +05:30
Hussain Nagaria
f5576d67dd
feat: Add Report Summary generation
2021-03-31 12:25:36 +05:30
Walstan Baptista
353aa59c42
test: sets company while making a project ( #25061 )
2021-03-31 12:16:54 +05:30
Walstan Baptista
d65458d534
test: corrected item name ( #25075 )
2021-03-31 12:14:41 +05:30
Rohit Waghchaure
410d36beca
fix: bom stock calculated report
2021-03-31 12:11:00 +05:30
Marica
8451da7924
Merge branch 'develop' into drop-shipping
2021-03-31 11:44:07 +05:30
Afshan
91a8a74d54
fix: column width in Recruitment Analytics report ( #25074 )
2021-03-31 11:30:04 +05:30
Anurag Mishra
720f69caaf
fix: column width in Recruitment analytics report ( #25003 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-31 11:23:34 +05:30
Anupam
41229ba705
fix: unable to submit stock entry
2021-03-31 02:32:25 +05:30
marination
a5de6c779b
fix: Cleaned up and fixed validation and bin updation on deletion
...
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
2021-03-31 02:03:26 +05:30
Andy Zhu
ba3578929e
Update accounts_controller.py
...
Updating Bin quantity based on doctype to optimize running efficiency.
2021-03-31 02:03:16 +05:30
Andy Zhu
c0ba6eafd5
fix: Update Items on Purchase Order
...
1. set warehouse using `get_item_warehouse`
2. update "reserved_qty" for sales order
2021-03-31 02:03:10 +05:30
Andy Zhu
a21e347bf1
fix: Update Items on Purchase Order
...
If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated.
This fix is not mature yet but to give an tempopary solution for fixing this issue.
2021-03-31 02:03:02 +05:30
marination
0673f558c1
fix: Cleaned up and fixed validation and bin updation on deletion
...
- Created separate smaller functions for validation and bin updation of deleted row
- Made sure previous doc (linked doc) was also updated after deletion of row
- Tests to check bin updation on add/update/delete
- Made reserved qty for subcontrating read only in bin
2021-03-31 01:42:18 +05:30
Prssanna Desai
7e442c74b6
Merge pull request #25020 from prssanna/help-links-fix-v13
2021-03-30 19:29:30 +05:30
Hussain Nagaria
1a0229eb36
feat: Add report table data generation
2021-03-30 18:20:22 +05:30
Marica
c5739957de
Merge branch 'develop' into patch-7
2021-03-30 18:07:32 +05:30
Deepesh Garg
6be78db62c
Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta
...
feat: Normal rounding for GST Taxes
2021-03-30 17:01:45 +05:30
Anurag Mishra
679177f9e0
Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix
...
fix: Employee profile pic upload access for erpnext user
2021-03-30 14:32:21 +05:30
Hussain Nagaria
2b85a81a1c
feat: Add filters to front end
2021-03-30 13:57:44 +05:30
Rucha Mahabal
30f67c3f57
fix: add filters to account link fields in Non Profit Settings ( #25060 )
...
- fetch memberships ordered by date in certificate
2021-03-30 12:39:56 +05:30
Rucha Mahabal
04c0296558
fix: add filters to account link fields in Non Profit Settings
...
- fetch memberships ordered by date in certificate
2021-03-30 12:30:40 +05:30
Hussain Nagaria
b7f2ba1556
feat: Add Report boilerplate
2021-03-30 12:19:16 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying ( #25058 )
2021-03-30 12:09:46 +05:30
Rucha Mahabal
a54eecb230
fix: membership renewal validation ( #24963 )
2021-03-30 12:02:52 +05:30
Rucha Mahabal
146cbb10f8
fix: calculate 80g certificate amount on validate for memberships ( #24925 )
2021-03-30 12:02:28 +05:30
Rucha Mahabal
5f4a2bfc61
fix(Non Profit): Membership and Donation API fixes ( #24900 )
...
* fix: Donation fixes
- differentiate between subscription payment and payment
- issue with donation amount
* fix: existing membership validation
* fix: ignore subscription payments while capturing donations
2021-03-30 12:02:09 +05:30
Rucha Mahabal
170d2efd35
fix(Payroll): Exchange Rate not getting set in Salary Slip ( #25013 )
2021-03-30 11:02:46 +05:30
Sagar Vora
7f43c051df
fix(Italy): setup, validations, optimisations
2021-03-29 21:18:26 +05:30
Deepesh Garg
f954ec7c78
fix: Add patch for GST category field in Delivery Note
2021-03-29 20:31:11 +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
Deepesh Garg
29997414ad
fix: Add GST category field in Dellivery Note
2021-03-29 19:49:52 +05:30
Deepesh Garg
237033704f
fix: Add test case
2021-03-29 16:42:59 +05:30
Deepesh Garg
c2548ddc75
feat: Normal rounding for GST Taxes
2021-03-29 16:42:47 +05:30
Saurabh
ceb026c5ab
bumped to version 13.0.0-beta.14
2021-03-28 16:14:56 +05:50
rohitwaghchaure
b38ea0cc8b
fix: patch ( #25014 )
...
* fix: patch
* fix: pricing_rule test cases
2021-03-28 15:51:32 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError ( #25044 )
2021-03-27 20:30:26 +05:30
rohitwaghchaure
f4901b4f22
Merge pull request #25034 from anupamvs/naming-pre-release
...
fix: unable to submit stock entry
2021-03-27 19:50:06 +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
Anupam
d429138dcc
fix: added flag for dont_fetch_price_list_rate in transaction
2021-03-27 19:31:23 +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
6c7f029597
Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release
...
fix: ams integration breaks when error raised
2021-03-27 09:59:51 +05:30
Anupam
4adaf7ed2e
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release
2021-03-27 00:56:48 +05:30
Anupam
5d994d8aa1
fix: unable to submit stock entry
2021-03-27 00:54:19 +05:30
Anupam
096da429ed
fix: unable to submit stock entry
2021-03-27 00:45:31 +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
Rohit Waghchaure
256b9c7bf9
fix: total weight not set for free items
2021-03-26 19:05:46 +05:30
Rohit Waghchaure
0486276789
fix: don't club same free item
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811
fix: nonetype object has no attribute options
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840
feat: recursive product discount
2021-03-26 19:05:43 +05:30
Rucha Mahabal
44853da7c2
feat: Show Required Qty as per BOM in Material Request Items
2021-03-26 18:55:16 +05:30
Rucha Mahabal
4cd68cdecb
feat: Add more fields to raw material download
2021-03-26 18:55:08 +05:30
Rucha Mahabal
d74ff72527
fix: Ordered and Reserved Qty for Production not getting fetched in Items
2021-03-26 18:55:00 +05:30
Rucha Mahabal
28a885a3a9
feat: show ordered and reserved qty in Material Request Plan Item table
2021-03-26 18:54:51 +05:30
Rucha Mahabal
efe2b425b1
feat(Production Plan): Consider Safety Stock in Required Qty Calculation
2021-03-26 18:54:34 +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
shariquerik
82d7986a2f
fix: sider fix
2021-03-26 17:02:37 +05:30
Saqib
f66aab6d98
fix: e-invoicing option visible even if settings disabled ( #25021 )
2021-03-26 16:40:51 +05:30
shariquerik
1989375be4
fix: Employee profile pic upload access for erpnext user
2021-03-26 16:34:22 +05:30
prssanna
5243eea532
style: fix formatting
2021-03-26 15:47:08 +05:30
prssanna
0ae0368d34
fix: re-execute add_standard_navbar_items patch
...
- check that same items aren't appended again
2021-03-26 15:47:07 +05:30
prssanna
eeb3121622
fix: missing help links in navbar help dropdown
2021-03-26 15:47:07 +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
hasnain2808@gmail.com
e9c801e4bd
fix: ams integration breaks when error raised
2021-03-26 14:32:02 +05:30
Nabin Hait
2a39b74ad2
fix: Fixes on job card and salary slip ( #25011 )
...
* fix: map conversion factor while making stock entry from job card
* fix: fetch additional salary in salary slip
2021-03-26 10:49:39 +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
pateljannat
c0b4eea415
fix: sider
2021-03-25 14:39:05 +05:30
pateljannat
6597bf7dd7
feat: profitability report default working hours and tests
2021-03-25 13:31:43 +05:30
Mohammad Hasnain Mohsin Rajan
52701dcbbc
fix: patch regional fields for old companies ( #24988 )
2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan
f29c075bc3
fix: patch regional fields for old companies ( #24999 )
...
* fix: patch regional fields for old companies
* chore: fix sider
2021-03-25 12:56:13 +05:30
Marica
36d125a720
Merge branch 'develop' into item-dashboard-fixes
2021-03-25 12:32:47 +05:30
Nabin Hait
d4499277b4
chore: Added change log
2021-03-25 12:18:22 +05:30
Marica
7c6f72fd39
Merge branch 'develop' into hide_alt_field
2021-03-25 12:15:58 +05:30
Nabin Hait
91026e026f
chore: Added change log
2021-03-25 11:53:07 +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
Rohit Waghchaure
244f3eeedc
fix: incorrect fieldname
2021-03-24 16:42:22 +05:30
Anurag Mishra
4217a4b1ff
Merge branch 'develop' into item-dashboard-fixes
2021-03-24 15:35:33 +05:30
Anupam Kumar
d1bbb4c311
Merge branch 'develop' into planning
2021-03-24 15:12:04 +05:30
rohitwaghchaure
3c490088c4
Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre
...
fix: repost not completed backdated transactions
2021-03-24 12:38:42 +05:30
Ishan Loya
de774ae080
Correct state code for 'Other Territory'
...
Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992
2021-03-24 12:30:51 +05:30
Rohit Waghchaure
9165327cf6
fix: repost not completed backdated transactions
2021-03-24 11:32:26 +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
Anupam Kumar
5c172044d7
fix: validate_series ( #24987 )
2021-03-23 21:13:06 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report ( #24983 )
2021-03-23 21:11:06 +05:30
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
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
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
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
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center ( #24831 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-18 11:22:24 +05:30
Rushabh Mehta
14c3c5172d
fix(minor): rearrange the cards on home workspace
2021-03-18 10:45:38 +05:30
Anuja P
2c8a38d9fa
fix: report issue summary fix for zero issues
2021-03-18 10:36:46 +05:30
Sagar Vora
500f54e515
test: fix shift type not found ( #24929 )
2021-03-17 23:25:04 +05:30
Sagar Vora
52bbd4e182
test: clear Leave Period before running Leave Allocation tests ( #24928 )
2021-03-17 22:37:59 +05:30
Sagar Vora
7645315424
test: set correct qty when creating subcontract transfer entry ( #24903 )
2021-03-17 20:01:21 +05:30
Sagar Vora
95e9b2fd6e
refactor(payroll): simplified logic for additional salary ( #24907 )
2021-03-17 19:58:56 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error ( #24915 )
2021-03-17 19:57:53 +05:30
Sagar Vora
cf3fc99b12
test: fix salary component not found; other optimisation ( #24920 )
2021-03-17 19:54:08 +05:30
Rucha Mahabal
bacfaa4396
fix: calculate 80g certificate amount on validate for memberships ( #24925 ) ( #24926 )
2021-03-17 19:51:59 +05:30
Rucha Mahabal
cbd67e662f
fix: calculate 80g certificate amount on validate for memberships ( #24925 )
2021-03-17 19:49:27 +05:30
Anurag Mishra
abf974daee
fix: precision and formated document
2021-03-17 18:55:04 +05:30
Rohit Waghchaure
77add49c6a
fix: don't club same free item
2021-03-17 18:49:54 +05:30
Deepesh Garg
438d9cad90
fix: Remove print statement
2021-03-17 18:04:05 +05:30
Deepesh Garg
f9519c7e13
fix: Group nil exempted and non gst items separately
2021-03-17 18:03:58 +05:30
Deepesh Garg
f9f0e347ed
fix: Remove print statement
2021-03-17 18:03:17 +05:30
Deepesh Garg
084ec9773e
fix: Group nil exempted and non gst items separately
2021-03-17 18:00:08 +05:30
Anurag Mishra
23b6294f5c
Merge pull request #24842 from resilient-tech/allow-duplicate-additional
...
fix(payroll): allow duplicate additional salaries
2021-03-17 17:39:52 +05:30
Deepesh Garg
a5987782bd
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-17 15:49:44 +05:30
Deepesh Garg
56c20fb79f
fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report
2021-03-17 15:47:03 +05:30
Rohit Waghchaure
a9b1347600
fix: nonetype object has no attribute options
2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a
feat: recursive product discount
2021-03-17 14:30:34 +05:30
Deepesh Garg
22f5ff8492
fix: Allow user to update exchange rate in Multi-currency LCV
2021-03-17 10:56:52 +05:30
Sagar Vora
68aaf12902
test: use _Test Company to avoid Holiday List error ( #24902 )
2021-03-17 10:06:05 +05:30
Sagar Vora
bce904cf97
test: fix Employee Not Found errors ( #24906 )
2021-03-17 10:03:30 +05:30
Sagar Vora
65d7f2c798
fix(Project): get correct holiday list when calculating dates; test fixes ( #24901 )
2021-03-17 10:00:35 +05:30
Andy Zhu
6117ac5aff
fix: copy_parent_value_in_all_row function error
2021-03-17 13:53:02 +13:00
Anurag Mishra
8fbb043190
Merge pull request #24824 from resilient-tech/fix-salary
...
refactor(payroll): simplified logic for additional salary
2021-03-16 21:42:10 +05:30
Rucha Mahabal
00cce433a5
fix(Non Profit): Membership and Donation API fixes ( #24900 ) ( #24905 )
...
* fix: Donation fixes
- differentiate between subscription payment and payment
- issue with donation amount
* fix: existing membership validation
* fix: ignore subscription payments while capturing donations
2021-03-16 20:52:53 +05:30
Rucha Mahabal
1482b2883f
fix(Non Profit): Membership and Donation API fixes ( #24900 )
...
* fix: Donation fixes
- differentiate between subscription payment and payment
- issue with donation amount
* fix: existing membership validation
* fix: ignore subscription payments while capturing donations
2021-03-16 20:08:51 +05:30
prssanna
1cdef8bd97
style: missing semicolon
2021-03-16 15:39:16 +05:30
prssanna
b8b89a02af
fix: item variant dialog dropdown issue
2021-03-16 14:16:22 +05:30
prssanna
f1dbc021fc
fix: issue web list style
2021-03-16 14:15:59 +05:30
Deepesh Garg
d4a3cf1395
Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13
2021-03-16 13:24:33 +05:30
Deepesh Garg
635c480771
fix: Add method for regional round off account back
2021-03-16 13:22:20 +05:30
Afshan
46eb4b2f90
Merge branch 'develop' into settings_for_eanbling_leave_notificstion
2021-03-16 13:15:55 +05:30
Deepesh Garg
004f9e6b0c
fix: Add method for regional round off account back
2021-03-16 13:09:59 +05:30
Anurag Mishra
6bafbffee0
fix: added also for leave applier as requested
2021-03-16 13:01:39 +05:30
Anurag Mishra
54482fd83f
feat: added for disabling leave notification in HR settings
2021-03-16 13:01:39 +05:30
Rushabh Mehta
45735b35c4
fix(minor): login: set as Login to ERPNext
2021-03-16 12:22:31 +05:30
marination
dd7d71ca2e
fix: POS Opening Entry with empty balance detail rows
2021-03-16 12:05:37 +05:30
Rushabh Mehta
6ef213e5c6
fix(minor): patch add_state_code_for_ladakh
2021-03-16 11:59:54 +05:30
Marica
4d869906b6
Merge branch 'develop' into drop-shipping
2021-03-16 11:43:46 +05:30
Deepesh Garg
7f2e45e0f4
fix: Unequal debit and credit issue on RCM Invoice ( #24838 )
...
* fix: Unequal debit and credit issue on RCM Invoice
* fix: Travis
2021-03-15 18:04:47 +05:30
Deepesh Garg
93f925fb98
fix: Unequal debit and credit issue on RCM Invoice ( #24836 )
...
* fix: Unequal debit and credit issue on RCM Invoice
* fix: Travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-15 18:04:42 +05:30
Raffael Meyer
db24b13a7d
Merge branch 'develop' into improve_taxes_setup
2021-03-15 13:27:56 +01:00
Anurag Mishra
5e475f85b9
Merge branch 'develop' into suplier_portal_fixes
2021-03-15 16:21:55 +05:30
Raffael Meyer
6d5ea4cee8
Merge branch 'develop' into improve_taxes_setup
2021-03-15 11:40:39 +01:00
Rohit Waghchaure
00a0e8da10
fix: validation of job card in stock entry
2021-03-15 14:15:10 +05:30
Marica
3575314260
Merge branch 'develop' into drop-shipping
2021-03-15 12:53:45 +05:30
Marica
4ceea333a7
fix: POS Opening Entry with empty balance detail rows ( #24876 )
2021-03-15 12:49:14 +05:30
Mohammad Hasnain Mohsin Rajan
46d5431bad
fix: Github Action not failing when tests fail ( #24867 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-15 11:17:19 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Marica
5499401fcb
Merge branch 'develop' into drop-shipping
2021-03-15 11:09:04 +05:30
Deepesh Garg
a2e4564464
fix: Prevent non sequential repayment entries
2021-03-15 10:32:38 +05:30
Anupam
d8f7a75eae
feat: add total available stock field
2021-03-15 10:31:53 +05:30
Deepesh Garg
5165859e51
Merge pull request #24873 from GangaManoj/filter-bank-reconciliation
...
fix(Bank Reconciliation Tool): Filter Bank Account drop-down list
2021-03-15 10:21:14 +05:30
Deepesh Garg
61fb9bf869
fix: Loan Repayment entry cancellation on salary slip cancel
2021-03-14 21:25:21 +05:30
Ganga Manoj
ca03997ab5
fix(Bank Reconciliation): Filter Bank Account drop-down list
2021-03-13 22:21:07 +05:30
Deepesh Garg
e196be4d8a
Merge pull request #24866 from resilient-tech/fix-test-import
...
test: fix import_doc call in test_shopify_settings
2021-03-13 19:12:15 +05:30
Sagar Vora
c5869d5b47
test: fix import_doc call in test_shopify_settings
2021-03-12 16:21:45 +05:30
Marica
51c500d446
fix: Don't throw exception on invoice lines when there is no item_code ( fixes #24640 ) ( #24864 )
...
Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>
2021-03-12 15:51:45 +05:30
Afshan
5d66a2b326
fix: added correct path in hooks ( #24862 )
2021-03-12 15:51:34 +05:30
Afshan
9ab3bedd0a
fix: added correct path in hooks ( #24865 )
2021-03-12 15:51:23 +05:30
marination
e685c787d2
fix: Sider (unused variables)
2021-03-12 14:24:09 +05:30
marination
86725a6580
fix: PO not created against all selected suppliers (drop shipping)
...
- Return list of created POs instead of first doc
- test case added
2021-03-12 14:12:46 +05:30
rohitwaghchaure
90ea17fbd6
Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre
...
fix: allow to select item code in batch naming
2021-03-12 11:52:43 +05:30
Sagar Vora
6727792aaf
test: fix syntax error
2021-03-11 18:12:01 +05:30
Raffael Meyer
fb68aba30d
Merge branch 'develop' into improve_taxes_setup
2021-03-11 13:17:44 +01:00
Sagar Vora
514122bf6f
refactor(payroll): simplified logic for additional salary
2021-03-11 17:22:11 +05:30
Nabin Hait
fe3529b194
fix: merge conflict
2021-03-11 16:45:41 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Ankush Menat
2b61491adb
fix: use account_name only in consolidated report ( #24840 )
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-11 16:05:58 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations ( #24848 )
...
* feat(Non Profit): 80G Certificates and Donations
* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849 )
2021-03-11 16:02:23 +05:30
Rucha Mahabal
d1e331f77f
fix(Membership): Generate Invoice for membership webhook only if automation is enabled ( #24849 )
2021-03-11 15:27:22 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Marica
63eb6bdb3c
Merge pull request #24643 from CaseSolvedUK/sinvfix-v13
...
fix: Don't throw exception on invoice lines when there is no item_code
2021-03-11 10:47:24 +05:30
Sagar Vora
5822b6d76f
fix(payroll): allow duplicate additional salaries
2021-03-10 21:45:32 +05:30
casesolved-co-uk
a780306ec7
fix: Don't throw exception on invoice lines when there is no item_code ( fixes #24640 )
2021-03-10 15:50:45 +00:00
Anupam Kumar
6f0fabc54e
fix: gle issue in internal transfer(Purchase) ( #24830 )
2021-03-10 18:36:46 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix
2021-03-10 16:35:59 +05:30
Raffael Meyer
fbd810c2ae
Merge branch 'develop' into improve_taxes_setup
2021-03-10 11:38:52 +01:00
Rucha Mahabal
c7fff34cf5
fix(travis): Customer Testcase Failing ( #24833 )
2021-03-10 15:51:44 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-10 15:23:48 +05:30
rohitwaghchaure
a0e7787f7b
fix: removed show cancelled entries checkbox from the stock ledger report ( #24826 )
2021-03-10 13:46:42 +05:30
Anupam Kumar
77eaf2939a
fix: rate of stock uom division by zero error ( #24829 )
2021-03-10 12:04:54 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Marica
6ccd64c2ec
Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable
...
feat: Make patient age translateable
2021-03-10 10:15:38 +05:30
Afshan
0623a34210
fix: added supplier warehouse field back again ( #24827 )
2021-03-10 09:46:38 +05:30
David Angulo
fe0f46c5b3
fix sider
2021-03-09 13:28:08 -06:00
David Angulo
06e99dfe7b
fix sider
2021-03-09 13:23:48 -06:00
David Angulo
358153b04b
fix sider
2021-03-09 13:19:12 -06:00
Francisco Roldán
894cff5aa4
fix: lms program and index missing context variables when is no data available ( #24828 )
...
* fix: program and index
* fix: moved default value to get_course_progress
2021-03-09 23:35:24 +05:30
Afshan
27bcb2a064
fix: renamed "supplier_warehouse" to "set_from_warehouse" ( #24816 )
...
* fix: reverting and adding new field for supplier warehouse
2021-03-09 22:25:48 +05:30
Anupam Kumar
832098f042
fix: In-Transit Feature enhancements ( #24652 )
2021-03-09 21:14:25 +05:30
Syed Mujeer Hashmi
ec829786e9
fix: Add student category to student applicant ( #24779 )
...
* fix: Add student category to student applicant
Student category will be automatically fetched during program
enrollment while importing students into the system.
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
* fix: Allow student category during program enrollment
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-03-09 21:04:55 +05:30
Rohan
db2d196296
fix: do not send emails to disabled users from Employee Onboarding ( #24795 )
2021-03-09 21:03:45 +05:30
Rohit Waghchaure
535406cb0c
fix: allow to select item code in batch naming
2021-03-09 21:01:12 +05:30
Jannat Patel
d7ac2394e8
fix: error in bulk attendance ( #24806 )
...
* fix: error in bulk attendance
* fix: no date selected scenario
* fix: translation and sider
2021-03-09 20:41:58 +05:30
Sagar Vora
78777d6ed4
fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From ( #24756 )
...
Co-authored-by: walstanb <walstanb@gmail.com>
2021-03-09 20:35:08 +05:30
Afshan
e314b8b209
fix: general ledger report ( #24770 )
2021-03-09 20:31:57 +05:30
Afshan
9f6015a4e9
fix: batch no in POS ( #24771 )
...
* fix: batch no in list
* fix: check for batch no to be list
2021-03-09 20:31:14 +05:30
Shariq Ansari
261c42186f
fix: updating phone icon setup logic for readonly fields ( #24787 )
...
* fix: updating phone icon setup logic for readonly fields
* fix: sider fix
2021-03-09 20:28:00 +05:30
Jannat Patel
fa73074250
fix: salary structure assign to employee ( #24798 )
...
* fix: salary structure assign to employee
* fix: pass data from dialog
2021-03-09 20:27:29 +05:30
Raffael Meyer
79b5be1830
fix: Group German VAT Accounts ( #24804 )
...
* fix: group account for tax assets and liabilities (germany)
* fix: spacing
2021-03-09 20:26:43 +05:30
Deepesh Garg
06a6ee37cb
fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool ( #24821 )
2021-03-09 20:23:26 +05:30
Deepesh Garg
47c6d2e00f
Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary
...
fix: sending proper arguments for TDS Computation Summary report
2021-03-09 20:01:30 +05:30
Deepesh Garg
6249798d84
Merge pull request #24801 from ankush/dont_update_pe_title
...
fix: do not update PE title during data import
2021-03-09 19:47:21 +05:30
Deepesh Garg
79005a4a76
Merge pull request #24820 from resilient-tech/fix-company-breadcrumbs
...
fix: breadcrumbs for company
2021-03-09 19:46:39 +05:30
Marica
e1ee9034ef
Merge branch 'develop' into item-attribute-fix
2021-03-09 18:35:44 +05:30
Marica
5accf8adf5
Merge branch 'develop' into salary_slip_error
2021-03-09 18:20:54 +05:30
Ankush Menat
9b4e5bfa87
chore: improve error message for missing fields.
2021-03-09 13:59:14 +05:30
Marica
5471265f92
Merge branch 'develop' into patch-6
2021-03-09 13:32:23 +05:30
walstanb
be98ee26cd
fix: breadcrumbs for company
2021-03-09 13:03:52 +05:30
Marica
baa406e99f
Merge pull request #24794 from alyf-de/set_value_instead_of_sql
...
fix: use set_value instead of sql
2021-03-09 11:54:31 +05:30
barredterra
99c8b8efcf
Merge branch 'develop' into improve_taxes_setup
2021-03-08 20:00:59 +01:00
barredterra
ebd1d08e55
refactor: taxes setup
...
Better structure of input data.
2021-03-08 19:53:50 +01:00
Afshan
d1fb363a37
Merge branch 'develop' into fix-tds-computation-summary
2021-03-08 22:50:04 +05:30
Afshan
d95b59e90c
fix: call function when arguments available
2021-03-08 18:19:53 +05:30
Ankush Menat
afc766bbf1
Merge branch 'develop' into dont_update_pe_title
2021-03-08 15:44:15 +05:30
Ankush Menat
5571b988dd
fix: make title field read only
2021-03-08 15:43:03 +05:30
Ankush Menat
cc46866cd9
fix: do not update PE title during data import
...
Related issue: ISS-20-21-10132
2021-03-08 15:42:39 +05:30
Afshan
1002e36c53
fix: removed unused import
2021-03-08 14:39:19 +05:30
Afshan
fa932e2a3e
fix: sending proper arguments for report
2021-03-08 14:36:40 +05:30
Deepesh Garg
48b0f0da96
Merge pull request #24776 from ankush/gst_invoice_validation
...
fix: Add warning for invalid GST invoice numbers
2021-03-07 18:09:00 +05:30
Rohit Waghchaure
4c089b5852
minor fixes
2021-03-07 12:17:59 +05:30
Deepesh Garg
45870317f2
Merge pull request #24797 from UrvashiKishnani/patch-1
...
fix: total row in AR/AP summary report
2021-03-06 21:28:04 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition ( #24800 )
2021-03-06 19:00:08 +05:30
Deepesh Garg
36a0085905
Merge pull request #24799 from danielchalmers/patch-8
...
fix: typo in Charts of Account doctype
2021-03-06 13:11:26 +05:30
Deepesh Garg
3e0a9383b4
Merge pull request #24789 from ankush/track_settings
...
fix: track setting changes
2021-03-06 13:09:58 +05:30
Saurabh
202ef92fa1
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-03-05 09:34:01 +05:30
Saurabh
4e1206bf21
bumped to version 13.0.0-beta.13
2021-03-05 09:54:01 +05:50
barredterra
25afad3dc1
refactor: extend taxes and charges setup
...
Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.
2021-03-04 21:11:31 +01:00
barredterra
dcfc3d7d12
fix: remove redundant calls to create_sales_tax
2021-03-04 19:29:55 +01:00
Saqib Ansari
49e4693abf
fix(patch): updating pos closing reference in merge log
2021-03-04 11:58:45 +05:30
Daniel Chalmers
9b4a258c89
Chart Of Accounts -> Chart of Accounts
2021-03-04 00:15:46 -06:00
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report
2021-03-04 09:21:25 +04:00
Raffael Meyer
f1d13a4ff3
Merge branch 'develop' into track_settings
2021-03-03 12:40:37 +01:00
barredterra
1521b31795
fix: use set_value instead of sql
2021-03-03 12:33:48 +01:00
barredterra
53d261702a
fix: make quick entry for Tax Category work
2021-03-03 11:52:48 +01:00
Ankush Menat
7c4c42ad67
refactor: move regex patterns to global variables
2021-03-03 14:56:19 +05:30
Ankush Menat
7c78220eac
Merge branch 'develop' into gst_invoice_validation
2021-03-03 13:38:14 +05:30
Ankush Menat
9b3f5d5f67
test: add tests for gst invoice name checks
2021-03-03 13:36:59 +05:30
Ankush Menat
a44df63a91
fix: Add warning for invalid GST invoice numbers
...
GST Invoice numbers should be 16 characters alphanumeric with dash(/) or
slash(-) only. Add check for doc.name before saving and warn about
naming series.
2021-03-03 11:26:12 +05:30
Deepesh Garg
82c6223196
Merge pull request #24745 from ankush/no_team_updates
...
fix(HR): hide "more" button from team updates
2021-03-02 18:55:34 +05:30
Deepesh Garg
ecde26409b
Update team_updates.js
2021-03-02 18:54:50 +05:30
Deepesh Garg
846500e8bc
Merge pull request #24751 from danielchalmers/patch-2
...
chore: Add description field & enable quick entry
2021-03-02 18:53:51 +05:30
Deepesh Garg
11092d0824
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:38:31 +05:30
Deepesh Garg
a5c4558f8b
feat: Additon of leave details in Salary Slip ( #24674 )
...
* feat: Additon of leave details in Salary Slip
* fix: Change leaves to leave
2021-03-02 18:36:48 +05:30
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet
...
feat: provision to pull timesheet in sales invoice
2021-03-02 18:05:42 +05:30
Ankush Menat
7d892438f0
fix: track setting changes
2021-03-02 17:50:58 +05:30
Deepesh Garg
f06c166ee4
Merge pull request #24773 from UrvashiKishnani/patch-1
...
fix: GL Entries for AP/AR Summary
2021-03-02 17:49:13 +05:30
Jannat Patel
b27d4f6095
fix: salary slip working hours increment ( #24784 )
2021-03-02 17:44:42 +05:30
Nabin Hait
d96be3f9f1
Reposting patch and earned leave rounding ( #24783 )
...
* fix: rounding of earned leave is optional (#24782 )
* fix: reposting patch fixes (#24775 )
2021-03-02 17:02:47 +05:30
Nabin Hait
190106a8b8
fix: rounding of earned leave is optional ( #24782 )
2021-03-02 13:38:14 +05:30
Nabin Hait
bd10d7c028
fix: reposting patch fixes ( #24775 )
2021-03-02 13:37:45 +05:30
Anupam
47ce85484b
feat: provistion to pull timesheet in sales invoice
2021-03-02 11:31:26 +05:30
UrvashiKishnani
810a36105c
fix: GL Entries for AP/AR Summary without SQL join
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
2021-03-02 08:20:03 +04:00
Deepesh Garg
f45756d821
Merge pull request #24735 from FHenry/fix_create_item_tax_with_salespurchasetax
...
fix: add item taxes at the same times as sales and purchase taxes
2021-03-01 20:52:42 +05:30
Deepesh Garg
236a232de0
Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming
...
fix: allow to select item code in batch naming
2021-03-01 20:25:14 +05:30
Daniel Chalmers
2efdfa26b4
fix: Change FieldType from Text to Text Editor in Non-Conformance DocType ( #24760 )
...
* Enable Text Editors
Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759
* Update non_conformance.json
2021-03-01 15:44:16 +05:30
UrvashiKishnani
10e4b9d4e8
fix: GL Entries for AP/AR Summary
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
2021-03-01 12:50:07 +04:00
Rohit Waghchaure
eb6b3cfe6d
fix: allow to select item code in batch naming
2021-03-01 11:32:39 +05:30
Anuja Pawar
8755339cba
fix: to update sales person's incentives on save ( #24179 )
2021-03-01 10:44:13 +05:30
Saqib
fa777555b7
fix(india): inflated item tax rate for e-invoicing ( #24752 )
2021-02-28 20:46:23 +05:30
Deepesh Garg
d7a81be56d
Merge pull request #24742 from deepeshgarg007/project_filter_search_fields
...
fix: Add searchfields in project query
2021-02-27 18:20:56 +05:30
Deepesh Garg
6fdd859a10
Merge pull request #24700 from deepeshgarg007/rounding_issue_fix
...
fix: Issue on posting inter-warehouse transfer invoice
2021-02-27 17:30:01 +05:30
Deepesh Garg
b5819c74c8
Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields
2021-02-27 17:29:11 +05:30
Daniel Chalmers
28da945ecd
Update quality_meeting.json
2021-02-26 21:14:12 -06:00
Daniel Chalmers
56f6dbb666
Remove obsolete section titles
2021-02-26 21:11:56 -06:00
Daniel Chalmers
aa09628358
Skill fields: enable allow_in_quick_entry
2021-02-26 15:24:34 -06:00
rohitwaghchaure
630ce6e531
Merge pull request #24754 from rohitwaghchaure/fixed-repost-item-valuation-patch
...
fix: reposting patch
2021-02-26 23:58:29 +05:30
rohitwaghchaure
0e89d71d34
Merge pull request #24755 from rohitwaghchaure/fixed-repost-item-valuation-patch-v13-pre
...
fix: reposting patch
2021-02-26 23:58:10 +05:30
Rohit Waghchaure
9f13a060f0
fix: reposting patch
2021-02-26 17:44:54 +05:30
Rohit Waghchaure
c603fd638b
fix: reposting patch
2021-02-26 17:42:52 +05:30
Saqib
3dfa017f1d
refactor: (coa importer) create coa tree with account no & account name ( #23601 )
2021-02-26 16:50:22 +05:30
Saqib
2a1b1537f9
fix(pos): rounded total and search fixes ( #24738 )
2021-02-26 16:49:28 +05:30
Daniel Chalmers
9803835436
Add "description" field to Skill doctype
...
Lets us describe a skill past just the title. Closes #23592
2021-02-26 00:33:48 -06:00
Deepesh Garg
28ca4ec79d
Merge branch 'develop' into fix_create_item_tax_with_salespurchasetax
2021-02-26 10:43:15 +05:30
Deepesh Garg
27da2bb63a
fix: Remove unique check from represents company field
2021-02-25 22:39:47 +05:30
Ankush Menat
027db0b41e
fix(HR): hide "more" button from team updates
2021-02-25 21:29:00 +05:30
Deepesh Garg
b85fb0c3a4
Merge branch 'develop' into rounding_issue_fix
2021-02-25 20:17:35 +05:30
Ankush Menat
dca307e7cc
feat: track changes to HR settings ( #24739 )
...
related issue: FR-ISS-259927
2021-02-25 19:05:07 +05:30
Syed Mujeer Hashmi
286e00bdf2
fix: Fetch Task subject from Task ( #24729 )
2021-02-25 19:02:54 +05:30
Afshan
1be997beb4
fix: reference variable in pricing rule ( #24711 )
2021-02-25 19:01:32 +05:30
Deepesh Garg
2d0b277ce0
Merge pull request #24054 from gwhitney/other_app_acc_dims
...
feat(Accounting Dimension): accounting dimension doctypes for other apps
2021-02-25 18:48:42 +05:30
Anurag Mishra
02f50a93e5
fix: copy variants property and Attributes whil duplicatinh item Tamplate ( #24662 )
2021-02-25 18:47:17 +05:30
Anuja Pawar
118a4ffb08
fix: rounding error in finished goods qty ( #24653 )
2021-02-25 18:44:44 +05:30
Mohammad Hasnain Mohsin Rajan
8cdba8ab64
fix: ams integration breaks when error raised ( #24383 )
2021-02-25 18:36:19 +05:30
Deepesh Garg
6af3c3fa2a
Merge pull request #24722 from danielchalmers/patch-1
...
fix: Allow renaming skills
2021-02-25 15:44:44 +05:30
Deepesh Garg
7a837170ea
Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims
2021-02-25 15:41:03 +05:30
Deepesh Garg
b990e71b4c
fix: Add search field in project query
2021-02-25 14:01:22 +05:30
Deepesh Garg
834a8b740d
Merge branch 'develop' into subscription_fix_new
2021-02-25 11:24:27 +05:30
Ankush Menat
325a461c34
Merge branch 'develop' into opening_round_gl
2021-02-25 07:53:48 +05:30
Daniel Chalmers
d3e122259d
Update skill.json
2021-02-24 17:13:48 -06:00
Florian HENRY
e11ce57f3c
fix: add item taxes at the same times as sales and purchase taxes
2021-02-24 21:45:29 +01:00
Afshan
684fc4e27b
fix: asset category name disappear ( #24728 )
2021-02-24 19:08:56 +05:30
Afshan
6bd2bbc953
fix: show custom button for saved projects ( #24730 )
...
* fix: show custom button for saved projects
* fix: slider
2021-02-24 18:13:10 +05:30
rohitwaghchaure
d0baa90b50
Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop
...
fix: patch failing because of incorrect gl entries
2021-02-24 17:18:43 +05:30
Afshan
84184559bc
fix: currency symbol in update items ( #24726 )
2021-02-24 16:51:11 +05:30
Saurabh
fefacced13
bumped to version 13.0.0-beta.12
2021-02-24 15:21:19 +05:50
Shariq Ansari
1dba7d2161
fix: Added parent task expected end date validation ( #24611 )
...
* fix: Added parent task expected end date validation
* fix: implemented suggested code
* fix: updated test case
2021-02-24 12:39:23 +05:30
Rucha Mahabal
402fcbd489
Merge pull request #24716 from pateljannat/issue-custom-buttons
...
fix: custom buttons in issue
2021-02-24 11:47:29 +05:30
Rohit Waghchaure
f613d41408
chore: change log
2021-02-24 11:20:29 +05:30
Ankush Menat
23c30e43f0
fix: make round off GLE always non-opening
...
Opening GL entries can not be for profit and loss accounts. Round off
accounts are by default P&L account. Hence when making opening entry,
make round off entries as non-opening.
Related issue: ISS-20-21-09677
2021-02-24 11:03:24 +05:30
Daniel Chalmers
c04ed62863
Allow renaming skills
2021-02-23 22:02:09 -06:00
Rohit Waghchaure
39b5ad8e69
fix: patch failing because of incorrect gl entries
2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
Deepesh Garg
231aec9257
Merge pull request #24478 from nextchamp-saqib/tcs_calculation
...
feat: tax collected at source using tax withholding category
2021-02-23 18:04:38 +05:30
pateljannat
1e2772d389
fix: custom buttons in issue
2021-02-23 17:55:51 +05:30
Ankush Menat
d5656f4b76
fix(india): Escape json characters in text fields ( #24699 )
...
Escape all text fields and add helpful error message if JSON decode
error does happen.
2021-02-23 17:26:37 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ( #24702 )
...
* fix(india): escape for special characters in JSON (#24695 )
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
* fix: Accounting Dimension creation background job timeout
* fix(regional): vehicle no is mandatory for ewaybill generation (#24679 )
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
* fix: excluding unidentified accounts from gstr-1
* fix: optimize reposting of sle and gle (#24694 )
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replaced spaces with tabs
* fix: merge conflict
* fix: test cases
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Saqib Ansari
85c91ca2db
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +05:30
Afshan
ae63d66b8f
fix: column names
2021-02-23 13:38:52 +05:30
Deepesh Garg
3dd0e49525
Merge pull request #24703 from deepeshgarg007/loan_test_precision_fix_new
...
fix: Precision fixes in loans
2021-02-23 11:22:52 +05:30
Deepesh Garg
8f8d9744f1
Merge pull request #24629 from deepeshgarg007/loan_dashboard
...
feat: Loans Dashboard
2021-02-23 11:22:32 +05:30
Deepesh Garg
b5a2320b33
fix: Precision fixes in loans
2021-02-22 23:04:48 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle ( #24694 )
...
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Nabin Hait
866cf70d3a
fix: validate pan
2021-02-22 21:35:00 +05:30
shariquerik
f5d6bd77e5
fix: item attributes not editable until refresh
2021-02-22 21:27:14 +05:30
Deepesh Garg
c839177f8e
fix: Issue on posting inter-warehouse transfer invoice
2021-02-22 21:04:51 +05:30
Marica
214951a9c6
Merge pull request #24631 from AfshanKhan/fix-valuation-errror-customer-provided
...
fix: check if customer provided item while setting opening stock
2021-02-22 20:10:27 +05:30
Nabin Hait
69a6bed106
fix: Replaced spaces with tabs
2021-02-22 20:03:23 +05:30
Shridhar Patil
58399f6524
fix: next follow up date should be always greater then current time ( #24308 )
2021-02-22 19:37:38 +05:30
Nabin Hait
0ca74ce04b
fix: Fixes related to client script renaming ( #24698 )
2021-02-22 19:32:51 +05:30
Ankush Menat
98a0feab89
fix(india): escape for special characters in JSON ( #24695 )
...
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
2021-02-22 19:30:02 +05:30
Deepesh Garg
bb8cd1cdaa
feat: Basic validation for indian PAN No. in Supplier ( #24687 )
2021-02-22 19:28:45 +05:30
Shariq Ansari
8676bedd18
fix: Add phone icon on read only phone fields ( #24680 )
...
* fix: Add phone icon on read only phone fields
* fix: sider fix
2021-02-22 19:28:01 +05:30
Saqib
14472f6bab
fix(regional): vehicle no is mandatory for ewaybill generation ( #24679 )
...
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
2021-02-22 19:27:23 +05:30
Afshan
fdafb55fba
fix: error message when making reverse journal entry ( #24665 )
2021-02-22 19:25:57 +05:30
Marica
28c834ac95
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 16:00:28 +05:30
rohitwaghchaure
311bb6452f
Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout
...
fix: Accounting Dimension creation background job timeout
2021-02-22 15:29:41 +05:30
Deepesh Garg
d780f56ba8
Revert "fix: Error handling in loan reports and precision fixes"
2021-02-22 15:12:35 +05:30
Afshan
133ebc1d51
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 14:16:33 +05:30
Marica
4a1ffcf742
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-22 11:34:34 +05:30
Afshan
01b4ee8a3c
Merge branch 'develop' into fix-valuation-errror-customer-provided
2021-02-22 11:17:45 +05:30
Deepesh Garg
aa46def745
fix: Accounting Dimension creation background job timeout
2021-02-21 21:54:23 +05:30
Deepesh Garg
e4964a0c6c
fix: Update color in charts
2021-02-21 21:03:42 +05:30
Deepesh Garg
e53fd87669
fix: Rearrange cards
2021-02-21 20:57:56 +05:30
Deepesh Garg
cbb4fe2cce
fix: Add cards
2021-02-21 20:57:30 +05:30
Deepesh Garg
a6d0610730
Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix
...
fix: Error handling in loan reports and precision fixes
2021-02-20 17:57:09 +05:30
Deepesh Garg
e12398e75e
Merge pull request #24682 from frappe/michellealva-leave
...
fix: typo in Leave Balance Report
2021-02-20 17:53:04 +05:30
Deepesh Garg
75b01e3d72
Merge pull request #24683 from frappe/michellealva-patch-1
...
fix: Typo in Leave Application
2021-02-20 17:52:38 +05:30
Deepesh Garg
bbadebcf64
Merge branch 'develop' into loan_exposure_report_fix
2021-02-20 17:32:17 +05:30
Deepesh Garg
6f29f67a83
Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue
...
fix: excluding unidentified accounts from gstr-1
2021-02-20 17:27:56 +05:30
Michelle Alva
43f126ed13
fix: Typo in Leave Application
...
Change "Leaves" to "Leave"
2021-02-20 10:46:22 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report
...
Change Leaves to Leave
2021-02-20 10:43:47 +05:30
rohitwaghchaure
1aad27a539
Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card
...
fix: [minor] validation of job card in stock entry
2021-02-19 21:22:57 +05:30
Saqib Ansari
8c7c682f17
chore: make parameter group optional
2021-02-19 20:35:23 +05:30
Deepesh Garg
6a5ef261f2
feat: Normal rounding for GST Taxes ( #24488 )
...
* feat: Normal rounding for GST Taxes
* fix: Add test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-19 14:30:23 +05:30
Deepesh Garg
811ff5c397
Merge pull request #24669 from deepeshgarg007/transaction_delete_fix
...
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:54:56 +05:30
Deepesh Garg
7efbbcf3aa
fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master
2021-02-19 10:53:58 +05:30
Deepesh Garg
bc857522ad
fix: Loan Interest Accrual Chart
2021-02-19 10:13:56 +05:30
Ankush Menat
3248da9089
fix(India): Add GST state code for Ladakh
2021-02-18 21:32:48 +05:30
Anupam Kumar
b1997da488
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-18 21:32:05 +05:30
Jannat Patel
4cef0f5983
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 21:30:13 +05:30
Ankush Menat
d9c84dff0f
fix(selling): cancel sales order with cancelled PE
...
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.
Related issue: ISS-20-21-09586
2021-02-18 21:29:12 +05:30
Ankush Menat
3508ed176b
test(selling): add test for cancelling sales order
...
Add failing test to reproduce bug in cancelling sales order with advance
payments
Related issue: ISS-20-21-09586
2021-02-18 21:29:03 +05:30
Nabin Hait
186a045e28
fix: update qty in future sle ( #24649 )
...
* fix: update qty in future sle
* fix: validate cancellation due to ongoing reposting
* fix: process sle against current timestamp
2021-02-18 21:28:28 +05:30
Nabin Hait
deddcc513d
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-18 21:28:16 +05:30
Rohit Waghchaure
83f5468ca1
fix: patch
2021-02-18 21:28:03 +05:30
rohitwaghchaure
7797e9d3ac
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-18 21:27:01 +05:30
Nabin Hait
f2be0805f7
fix: formatting query args ( #24627 )
2021-02-18 21:25:59 +05:30
rohitwaghchaure
76f616565e
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-18 21:25:40 +05:30
Ankush Menat
4b2cbdc2dd
fix: update total in words after updating items ( #24602 )
...
* fix: Update total in words after Updating items
Update total in words after Updating items in sales/purchase orders.
Port of #24592
Closes ISS-20-21-09425
* test: Add test for total & words after update item
Add test for total & words after updating items in sales order.
2021-02-18 21:25:00 +05:30
rohitwaghchaure
83792ec009
fix: reposting issue with same posting date and posting time ( #24570 )
...
* fix: reposting issue with same posting date and posting time
* Update erpnext/stock/stock_ledger.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 21:24:48 +05:30
Nabin Hait
56e6ca6285
fix: couple of travis fixes ( #24554 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-18 21:24:31 +05:30
Afshan
33f4419a78
fix: StopIteration error when e-invoice not enabled ( #24548 )
...
* fix: StopIteration error when e-invoice not enabled
* chore: update message
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 21:23:38 +05:30
Deepesh Garg
d60a40ae82
fix: Add accounts user role permission for accounting dimension filter
2021-02-18 21:23:20 +05:30
Afshan
83768b68c1
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 21:20:14 +05:30
Saqib
90ff48baa3
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-18 21:00:34 +05:30
Saqib
e965d0ff90
fix: discount amount calculation on net total ( #24497 )
2021-02-18 20:59:46 +05:30
Saqib
fd4bed1a38
fix(e-invoice): do not validate gstin for exports ( #24561 )
2021-02-18 20:59:26 +05:30
Saqib
ade96589b4
fix(e-invoice): skip e-invoice generation for non-taxable invoices ( #24568 )
2021-02-18 20:58:54 +05:30
Saqib
18c7c45cfe
fix: NoneType has no len() ( #24600 )
2021-02-18 20:55:53 +05:30
Saqib
4fb547179d
fix: customer_currency referenced before assignment ( #24607 )
2021-02-18 20:53:49 +05:30
Saqib
a439d19917
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-18 20:53:26 +05:30
Saqib
57c2e07c45
fix: validate cancellation only if irn generated ( #24608 )
2021-02-18 20:45:27 +05:30
Anupam Kumar
4dad1f01ba
fix: contact permmission issue ( #24503 )
2021-02-18 20:26:39 +05:30
Rucha Mahabal
73c2d23a9a
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 20:22:41 +05:30
Anupam Kumar
6485eeb302
fix: portal permission issue ( #24577 )
2021-02-18 20:21:39 +05:30
pateljannat
4858b40813
fix: excluding unidentified accounts from gstr-1
2021-02-18 18:44:29 +05:30
Marica
77d72d59ef
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-18 16:55:44 +05:30
Marica
f3ca4bcb70
Merge branch 'develop' into rfq-contact-email-set
2021-02-18 16:51:50 +05:30
Rucha Mahabal
ccc80927f6
feat: Department Wise Appointment Type charges ( #24572 )
...
* feat: Appointment Type Service Items
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* fix: set practitioner service item charges mandatory on item selection
Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com>
* feat: use charges from appointment type during billing
* feat: handle appointment charges priority for invoice automation
* test: patient appointment auto invoicing scenarios
* fix: sider
* fix: minor fixes
Co-authored-by: muhammad <muhammadmp@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-18 16:41:10 +05:30
Raffael Meyer
d44e60f17c
feat: add Print Language to Lead and Opportunity ( #24317 )
...
* fix: move "Print Language" to "More Information"
* feat: add "Print Language" in "More Information"
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 16:24:37 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items ( #24292 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 16:04:35 +05:30
Jannat Patel
ef5c714de2
fix: salary slip attribute error ( #24455 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-02-18 15:52:29 +05:30
Rohit Waghchaure
c697cb8b2d
fix: validation of job card in stock entry
2021-02-18 15:10:12 +05:30
Nabin Hait
d826bee13a
fix: update qty in future sle ( #24649 )
...
* fix: update qty in future sle
* fix: validate cancellation due to ongoing reposting
* fix: process sle against current timestamp
2021-02-18 14:14:21 +05:30
Anurag Mishra
5ec592d09c
fix: supplier was not able to Submit RFQ due to in sufficient permission
2021-02-18 13:42:04 +05:30
Deepesh Garg
c5b94adc87
Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so
...
fix(selling): cancel sales order with cancelled PE
2021-02-17 18:39:35 +05:30
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +05:30
Marica
208d1942c3
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-17 12:56:35 +05:30
Marica
7de7bb5202
Merge branch 'develop' into item_group_on_update_items
2021-02-16 23:06:20 +05:30
Marica
4441cebbb3
Merge branch 'develop' into shopping-cart
2021-02-16 20:55:00 +05:30
Ankush Menat
3f16902b00
fix(selling): cancel sales order with cancelled PE
...
Allow cancelling sales order with cancelled payment entry. Ignoring GL
entries while cancelling the document is required to cancel it, reverse
entries are created by accounts controller.
Related issue: ISS-20-21-09586
2021-02-16 18:53:40 +05:30
Ankush Menat
f9d4d9a095
test(selling): add test for cancelling sales order
...
Add failing test to reproduce bug in cancelling sales order with advance
payments
Related issue: ISS-20-21-09586
2021-02-16 18:45:39 +05:30
prssanna
9c36dc3798
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-16 16:17:32 +05:30
prssanna
7166b6740f
fix: duplicate css property
2021-02-16 16:17:17 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
prssanna
7e8113c7e8
fix: broken image style
2021-02-16 12:00:35 +05:30
Rohit Waghchaure
9a40c1b2e1
fix: patch
2021-02-16 10:35:10 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Deepesh Garg
79f63526cb
Merge pull request #24632 from ankush/ladakh_gst_addition
...
fix(India): Add GST state code for Ladakh
2021-02-15 21:11:54 +05:30
Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +05:30
Nabin Hait
243661b37b
fix: formatting query args ( #24627 )
2021-02-15 19:27:49 +05:30
Rushabh Mehta
8cc6a2d62c
fix(typo): erpnext-logo.png
2021-02-15 17:40:50 +05:30
Rushabh Mehta
b0735732f9
fix(minor): add erpnext-logo.png
2021-02-15 17:38:55 +05:30
Deepesh Garg
df4eed4c0d
Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13
...
fix: Issues with packing items
2021-02-15 16:44:10 +05:30
Deepesh Garg
47f5f4757a
Merge branch 'develop' into fixed-consolidated-report-not-working-develop
2021-02-15 16:35:31 +05:30
Deepesh Garg
b6cd97e5fc
Merge pull request #24320 from pateljannat/ldc-validations
...
fix: validation for ldc against supplier and section code
2021-02-15 16:33:41 +05:30
Deepesh Garg
535dc4aea2
fix: Do not round off per day interest
2021-02-15 15:54:25 +05:30
Ankush Menat
57c3d373a7
fix(India): Add GST state code for Ladakh
2021-02-15 15:03:50 +05:30
Afshan
e963362dfd
fix: check if customer provided item while setting opening stock
2021-02-15 15:00:37 +05:30
Deepesh Garg
429fb3bba8
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix
2021-02-15 14:10:10 +05:30
Deepesh Garg
9bf05ad927
feat: Loans Dashboard
2021-02-15 13:32:50 +05:30
Richard Case
fd4e7bdbb1
fix: plaid client version to support latest API ( #24531 )
2021-02-15 11:58:27 +05:30
Marica
45db1c5d74
Merge branch 'develop' into shopping-cart
2021-02-15 10:35:05 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +05:30
Nabin Hait
85252e7aef
Merge branch 'develop' into packed-item-fixes_v13
2021-02-12 12:39:38 +05:30
Afshan
c44d6b9546
fix: NoneType object has no attribute len() ( #24616 )
2021-02-12 12:24:41 +05:30
Marica
87fcae4efd
Merge branch 'develop' into shopping-cart
2021-02-12 12:16:13 +05:30
Rucha Mahabal
ad1f2b41f4
fix: Issues with packing items
2021-02-12 11:29:24 +05:30
Saqib Ansari
138e98fef2
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-12 11:19:25 +05:30
Nabin Hait
1e6cce3593
Merge branch 'develop' into item_group_on_update_items
2021-02-11 21:59:38 +05:30
Jannat Patel
bb0d8f8038
Update accounts_controller.py
2021-02-11 20:59:28 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-11 20:19:30 +05:30
Afshan
ee87484134
fix: calculated discount percentage ( #24510 )
...
* fix: calculated discount percentage
* fix: slider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 20:11:58 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports ( #24462 )
...
* fix: dynamic links for reports
* fix: revert changes for payment period report
* fix: link doctypes
2021-02-11 20:11:06 +05:30
marination
e2d0715cdf
fix: Server side validation for missing payment gateway account
2021-02-11 19:06:10 +05:30
marination
8615227090
fix: Shopping cart breaks without Payment Gateway Account
2021-02-11 18:51:35 +05:30
Saqib
f25ab6f826
fix: validate cancellation only if irn generated ( #24608 )
2021-02-11 17:50:57 +05:30
Jannat Patel
6756d3b561
Merge branch 'develop' into item_group_on_update_items
2021-02-11 16:29:34 +05:30
Marica
819b8d0266
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 14:45:09 +05:30
Saqib
0681a480c2
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-11 14:06:15 +05:30
Shariq Ansari
a46a83b476
fix: Assignment Rule Unassign Condition doesn't work ( #24551 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:41:10 +05:30
Nabin Hait
aa235b36e0
Update erpnext/controllers/accounts_controller.py
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-11 13:26:53 +05:30
Marica
a5039e8f85
Merge branch 'develop' into rfq-contact-email-set
2021-02-11 13:23:56 +05:30
Shariq Ansari
47f784aa9c
fix: Lead not getting linked to call logs ( #24593 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:23:51 +05:30
rohitwaghchaure
aa00eb9898
fix: reposting issue with same posting date and posting time ( #24570 )
...
* fix: reposting issue with same posting date and posting time
* Update erpnext/stock/stock_ledger.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-11 13:23:01 +05:30
Saqib
e37a5c2646
fix: customer_currency referenced before assignment ( #24607 )
2021-02-11 13:10:52 +05:30
Saqib
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +05:30
Saqib
15f4672ffa
fix: pos closing valdation ( #24605 )
2021-02-11 12:11:44 +05:30
Jannat Patel
30c8873f24
fix: validation for disabled warehouse ( #24539 )
...
* fix: validation for disabled warehouse
* fix: better function name
* fix: validation in stock ledger entry
2021-02-11 11:46:48 +05:30
Kanchan Chauhan
bb05acb60d
fix(Leave Application): List view fix ( #24550 )
2021-02-11 11:18:59 +05:30
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
b58b8ec2fb
Merge branch 'develop' into quality-inspection-parameter-group
2021-02-11 11:14:02 +05:30
Anupam Kumar
e816ed89e6
fix: portal permission issue ( #24577 )
2021-02-11 11:12:13 +05:30
Anuja Pawar
e3c72a3d71
fix: fix filters for the report ( #24594 )
2021-02-11 11:06:12 +05:30
Afshan
8609d31430
fix: amend cancelled job offer ( #24589 )
2021-02-11 11:05:48 +05:30
Ankush Menat
df6e20887d
fix: update total in words after updating items ( #24602 )
...
* fix: Update total in words after Updating items
Update total in words after Updating items in sales/purchase orders.
Port of #24592
Closes ISS-20-21-09425
* test: Add test for total & words after update item
Add test for total & words after updating items in sales order.
2021-02-11 11:04:39 +05:30
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +05:30
Suraj Shetty
969d37da4c
Merge pull request #24598 from surajshetty3416/fix-favicon
2021-02-10 22:18:10 +05:30
Saqib
7b2afaf349
fix: NoneType has no len() ( #24600 )
2021-02-10 17:21:12 +05:30
Prssanna Desai
161e3954a8
Merge branch 'develop' into fix-favicon
2021-02-10 16:37:13 +05:30
Rucha Mahabal
3237f5bb88
fix: Inpatient Medication Orders report test ( #24596 )
2021-02-10 16:36:49 +05:30
prssanna
fd0e8a4e23
fix: also fetch item variants if hide variants is disabled
2021-02-10 16:31:41 +05:30
Suraj Shetty
5f27c9e100
chore: Remove unnecessary image files
2021-02-10 15:48:58 +05:30
Suraj Shetty
6fa44fefc3
fix: Use new favicon
2021-02-10 15:48:32 +05:30
Marica
bb87950e96
Merge branch 'develop' into rfq-contact-email-set
2021-02-10 12:02:14 +05:30
pateljannat
1ab95413be
fix: conditions simplified
2021-02-09 17:35:17 +05:30
Deepesh Garg
516b3ae1bc
fix: get company attribute
2021-02-09 16:47:55 +05:30
Deepesh Garg
45cec6928b
fix: get company attribute
2021-02-09 16:44:12 +05:30
Deepesh Garg
5006a2065e
fix: Comment
2021-02-09 16:38:11 +05:30
Anurag Mishra
5164223b99
fix: error on group by filter ( #24587 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-02-09 16:22:28 +05:30
pateljannat
637ddff6e9
fix: code cleanup
2021-02-09 16:17:30 +05:30
Deepesh Garg
e56daeb347
fix: Multiple fixes in subscription
2021-02-09 16:13:45 +05:30
Suraj Shetty
1016ff48fc
fix: Create new call popup if call popup does not exists
2021-02-09 12:17:29 +05:30
Marica
6330e20d16
Merge pull request #24565 from marination/stock-dashboard-font-weight
...
fix: (ui) Empty State text font weight in Item Dashboard
2021-02-09 11:03:18 +05:30
Deepesh Garg
236c9ae453
Merge pull request #24578 from marination/acc-dimension-update-fix
...
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-09 06:51:58 +05:30
Suraj Shetty
fbc3988037
Merge pull request #24581 from surajshetty3416/fix-telephony
2021-02-08 20:27:04 +05:30
Saqib
8991d4ed0b
fix: fetching of standalone cr/dr notes for reconciliation ( #24575 )
2021-02-08 20:19:11 +05:30
Suraj Shetty
dcc9947d10
fix: Update call_popup
...
- Setup missed & call ended listeners
- Show contacts based on links
2021-02-08 20:13:23 +05:30
Suraj Shetty
c5248b30eb
fix: Do not re-use call popup if call ID is different
2021-02-08 18:50:05 +05:30
Suraj Shetty
ba26020a82
fix: Show audio interface in call log which has recording URL
...
- Also, remove unneccesary column & section break in call log doctype
2021-02-08 18:45:55 +05:30
Suraj Shetty
723e6dd73f
fix: Update style of call log shown in timeline
2021-02-08 18:43:26 +05:30
Suraj Shetty
c4d67c2afe
refactor: Move call_popup style from less to scss
...
- Add style for audio
2021-02-08 18:42:27 +05:30
marination
5a7ddba9a3
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-08 17:06:23 +05:30
Afshan
53dbe39d12
fix: StopIteration error when e-invoice not enabled ( #24548 )
...
* fix: StopIteration error when e-invoice not enabled
* chore: update message
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-08 12:32:42 +05:30
Saqib
9490122abb
fix(e-invoice): skip e-invoice generation for non-taxable invoices ( #24568 )
2021-02-08 11:40:56 +05:30
Marica
0aef0fd764
Merge branch 'develop' into stock-dashboard-font-weight
2021-02-08 10:34:17 +05:30
marination
a97eb6a052
fix: Empty State text font weight in Item Dashboard
2021-02-07 22:27:40 +05:30
Saqib
f29b811a56
fix(e-invoice): do not validate gstin for exports ( #24561 )
2021-02-06 17:55:20 +05:30
Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report ( #24483 )
2021-02-05 23:35:47 +05:30
Nabin Hait
c4a1bb0e1c
fix: couple of travis fixes ( #24554 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-05 23:34:18 +05:30
prssanna
4742a25942
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2021-02-05 17:35:29 +05:30
prssanna
91b41db9e3
fix: check if product_info exists before setting price
2021-02-05 17:34:56 +05:30
Anupam
d7f4aefd00
feat: added continue-shopping button on cart
2021-02-05 16:17:20 +05:30
Prssanna Desai
b8f4cdfbce
Merge pull request #24555 from prssanna/product-query-fix
...
fix: check if product_info exists
2021-02-05 14:54:23 +05:30
prssanna
a7820f310c
fix: check if product_info exists
2021-02-05 14:52:31 +05:30
Afshan
b814b002ce
fix: creating salary slip from timesheet ( #24541 )
2021-02-05 11:34:55 +05:30
Saqib Ansari
8c3da162ba
feat: introduce parameter group in quality inspection
2021-02-04 19:39:41 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation
2021-02-04 18:38:26 +05:30
Deepesh Garg
dce73d1881
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:06:36 +05:30
pateljannat
0701f08ab6
fix: item_group on update items
2021-02-03 11:53:14 +05:30
Nabin Hait
7177579051
fix: Dependant sle logic fixes ( #24489 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
2021-02-02 22:03:07 +05:30
Saurabh
df589594cd
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-02-02 20:58:26 +05:30
Saurabh
7645e5319d
bumped to version 13.0.0-beta.11
2021-02-02 21:15:21 +05:50
Afshan
c0f8f32801
fix: fetch query for employee ( #24529 )
2021-02-02 20:27:23 +05:30
Saurabh
17433d2c90
fix: version number
2021-02-02 17:40:11 +05:30
Nabin Hait
243d59b0c3
Reposting logic fixes ( #24520 )
...
* fix: Dependant sle logic fixes
* fix: negative qty validation
* fix: Travis fixes
* fix: test fix
2021-02-02 16:55:13 +05:30
Afshan
10b00f9d0d
fix: separation of salary creation from payroll ( #24528 )
...
* fix: separation of salary creation from payroll
* fix: removed unnecessary veriable
* fix: check existing sal slips
* fix: existing checks
* style: refactoring query
2021-02-02 16:24:01 +05:30
Anupam Kumar
7d64a291b8
fix: contact permmission issue ( #24503 )
2021-02-02 12:43:13 +05:30
Afshan
91a02868cb
fix: emp disappear ( #24525 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:04:25 +05:30
Afshan
8676089794
fix: emp disappear ( #24524 )
...
* fix: emp disappear
* fix: renamed set_totals_call to set_totals
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-02 11:02:22 +05:30
Nabin Hait
bf97eb2d3b
core: Added change log ( #24526 )
2021-02-02 10:57:55 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Rohit Waghchaure
d4d639c7ed
fix: test cases for pricing rule
2021-02-01 23:01:18 +05:30
Rohit Waghchaure
5c28416daa
fix: test cases for pricing rule
2021-02-01 22:58:22 +05:30
Suraj Shetty
d809de6579
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 22:40:46 +05:30
Suraj Shetty
852e67c5ee
fix(patch): Use db_set to ignore validation
2021-02-01 22:40:40 +05:30
prssanna
6f1664223d
style: missing semicolon
2021-02-01 20:43:30 +05:30
prssanna
44a055b52f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:39:20 +05:30
Marica
0ea2587679
fix: Numeric/Non-numeric QI UX ( #24516 )
...
* chore: Show 1 field each of both types of Insoections in grid view
* fix: Make QI check Numeric by default and make checkbox "Numeric"
- Reducing cognitive load
2021-02-01 20:38:53 +05:30
Marica
003ae90e12
fix: Numeric/Non-numeric QI UX ( #24517 )
...
* chore: Show 1 field each of both types of Insoections in grid view
* fix: Make QI check Numeric by default and make checkbox "Numeric"
- Reducing cognitive load
2021-02-01 20:38:32 +05:30
prssanna
73d60aa498
style: fix formatting
2021-02-01 20:38:17 +05:30
Suraj Shetty
cfb5f58141
style: Fix formatting issues
2021-02-01 20:37:18 +05:30
Saurabh
9dcb286c31
fix: consider select perm while setting party details ( #24518 )
2021-02-01 20:36:15 +05:30
Suraj Shetty
723bd9676d
style: Fix formatting issues
2021-02-01 20:34:21 +05:30
prssanna
62442d1c52
style: fix formatting
2021-02-01 20:26:09 +05:30
rohitwaghchaure
bf7317d4e2
fix: multiple pricing rule issue ( #24509 )
2021-02-01 20:22:14 +05:30
rohitwaghchaure
68edf749ec
fix: multiple pricing rule issue ( #24515 )
2021-02-01 20:22:02 +05:30
Saurabh
081f506992
fix: consider select perm while setting party details ( #24514 )
2021-02-01 20:18:44 +05:30
prssanna
9a69c0e21e
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:13:01 +05:30
prssanna
526ea46ae2
fix: formatting issues
2021-02-01 20:12:47 +05:30
Suraj Shetty
159063db29
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:09:58 +05:30
Suraj Shetty
f57efd1150
style: Fix invalid translation syntax usages
2021-02-01 20:09:20 +05:30
Marica
2fa840e5d4
chore: Use sql to set naming series in older projects ( #24513 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:07:00 +05:30
Marica
fb016edb7a
chore: Use sql to set naming series in older projects ( #24512 )
...
* chore: Use sql to set naming series in older projects
* fix: Remove unncessary db.commit()
2021-02-01 20:05:29 +05:30
prssanna
53225f5cbb
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 20:01:54 +05:30
prssanna
11eae6d51a
fix: add default product-image css class
2021-02-01 20:01:37 +05:30
Suraj Shetty
8fef3a3814
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:52:12 +05:30
Suraj Shetty
1ab79da7d1
style: Fix formatting issues
2021-02-01 19:51:25 +05:30
prssanna
ba54c4f1b3
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:50:46 +05:30
prssanna
a3585e40f7
style: fix formatting
2021-02-01 19:50:27 +05:30
Suraj Shetty
8030abe1bd
Merge branches 'rebrand-ui' and 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 19:41:03 +05:30
Suraj Shetty
f67bf7ae98
chore: Fix formatting issues
2021-02-01 19:40:44 +05:30
prssanna
1d346702ed
chore: add .stylelintrc file
2021-02-01 19:07:32 +05:30
prssanna
7863118994
fix: docs link for store page in shopping cart settings
2021-02-01 18:57:30 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Suraj Shetty
13d48a0c20
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:11:07 +05:30
Suraj Shetty
055b81da7b
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-02-01 15:10:52 +05:30
Saqib
beebaf6e1e
refactor: assets form cleanup with rebrand ui ( #24494 )
2021-02-01 11:22:57 +05:30
Deepesh Garg
ab88ec208e
fix: Error handling in loan reports
2021-01-31 12:31:46 +05:30
prssanna
2aebf99968
fix: add removed get_employee_emails function
2021-01-29 15:55:21 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation
2021-01-29 14:26:48 +05:30
Saqib
77d5f59376
fix: discount amount calculation on net total ( #24497 )
2021-01-29 14:24:08 +05:30
pateljannat
fd91973ac1
fix: template task parent child deadlock
2021-01-29 13:18:39 +05:30
Rohit Waghchaure
aeba3d311c
fix: extra transferred qty has not consumed against work order
2021-01-29 12:33:09 +05:30
rohitwaghchaure
cf3e0cf271
Merge pull request #24365 from rohitwaghchaure/fixed-extra-trasnferred_qty_issue-develop
...
fix: extra transferred qty has not consumed against work order
2021-01-29 12:28:28 +05:30
Saqib Ansari
3b2327ba8d
fix: sider
2021-01-29 12:08:35 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Deepesh Garg
7e3f5e04ab
fix: LTV ration in interest report
2021-01-28 23:25:23 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
leela
3234df5581
feat: improved call log doctype
...
* Added links and some more fields into Call Log Doctype
* Display call info in the call log link pages
2021-01-28 18:34:58 +05:30
Saqib
62dfff5dde
Merge branch 'develop' into tcs_calculation
2021-01-28 18:08:13 +05:30
Saqib Ansari
4d9b6066a2
fix: tcs amount calculation
2021-01-28 18:07:08 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Anupam Kumar
0d9a8ae4d2
feat: shopping portal changes ( #24445 )
...
* feat: shopping portal changes
* fix: review changes
* review changes
2021-01-28 17:32:57 +05:30
Anupam
e6f925e5e6
review changes
2021-01-28 15:58:03 +05:30
Marica
56c6805d79
Merge branch 'develop' into fixed-extra-trasnferred_qty_issue-develop
2021-01-28 15:03:15 +05:30
Marica
9580adad0c
Merge branch 'develop' into project-naming-series-patch
2021-01-28 14:32:11 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency
2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Marica
465974cff0
Merge branch 'develop' into project-naming-series-patch
2021-01-28 13:01:28 +05:30
Marica
ed6368d782
Merge pull request #24481 from marination/stock-entry-indicator
...
chore: Set Stock Entry Form Indicators in setup
2021-01-28 13:00:24 +05:30
Marica
9e11521764
Merge pull request #24466 from marination/stock-entry-qi
...
fix: Always show QI Template in Item
2021-01-28 12:45:49 +05:30
Mohamed Almubarak
f7ea340181
fix(template): cards on second row overlaps the one before ( #23454 )
...
* Update macros.html
fix second row of cards overlapps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
* Update macros.html
fix(template): second row of cards overlaps with the one before
2021-01-28 12:32:13 +05:30
Jannat Patel
9f8cbe9101
Material request wrong status issue ( #24019 )
...
* fix: material request status fix
* fix: changing precision to global defaults for material request status
* fix: adding back the removed flt
* fix: sider issues fixed
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2021-01-28 12:29:52 +05:30
Saqib
8e55677f10
feat: deleting account & stock entries on deletion of transaction ( #24298 )
...
* feat: control for deleting account & stock entries on deletion of a transaction
* chore: change label & fieldname
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 12:26:45 +05:30
Jannat Patel
3914aca647
fix: check for tax rate ( #24376 )
2021-01-28 12:25:15 +05:30
Anurag Mishra
5756bf50e6
fix: removed all day event from shift assignment calendar ( #24397 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-28 12:24:39 +05:30
Afshan
e5529ad461
fix: validate tax template for tax category ( #24402 )
...
* fix: validate tax template for tax category
* Update sales_taxes_and_charges_template.py
2021-01-28 12:22:39 +05:30
Raffael Meyer
f6f4376463
feat: remove german sales invoice validation ( #24441 )
...
This can be better achieved via Customize Form
(mandatory and mandatory_depends_on)
2021-01-28 12:16:26 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency
2021-01-28 12:15:09 +05:30
Marica
cdccf4be52
Merge branch 'develop' into stock-entry-qi
2021-01-28 12:12:03 +05:30
Deepesh Garg
16bcd01f6d
feat: Provision to disable serial no and batch selector ( #24398 )
...
* feat: feat: Provision to disbale serial no and batch selector
* fix: Sider issues
* fix: Linting issues
2021-01-28 12:09:35 +05:30
Deepesh Garg
bd9bdc5797
feat: Batch wise item pricing ( #24470 )
...
* feat: Batch wise item pricing
* fix: Rate for items with no batch
* fix: Add test case for batch pricing
* fix: Sider Issues
* fix: Add item filter for batch
2021-01-28 12:05:57 +05:30
marination
27bac2aaec
fix: Missing semi-colon
2021-01-28 12:04:14 +05:30
pateljannat
55e7c5644c
fix:rfq contact email set
2021-01-28 12:00:18 +05:30
marination
bc370b3ee5
chore: Set Stock Entry Form Indicators in setup
...
- Makes it easier to override via customisations
- Style consistency with other forms that set indicator in setup as well
2021-01-28 11:44:26 +05:30
Marica
ea7c2dbfaf
Merge branch 'develop' into stock-entry-qi
2021-01-28 11:31:43 +05:30
Saqib
31eb740aef
Merge branch 'develop' into tcs_calculation
2021-01-27 19:47:19 +05:30
Saqib Ansari
ae9a9a2167
fix: tcs chargable amount
2021-01-27 19:36:29 +05:30
Saqib Ansari
ff12f91486
feat: charging tcs on sales invoice
2021-01-27 19:17:38 +05:30
prssanna
74feaf85dc
fix: website order page style
2021-01-27 17:41:15 +05:30
Saqib Ansari
6db14d02d2
fix: test
2021-01-27 17:11:34 +05:30
Saqib Ansari
58250aac10
feat: pan and tax withholding category fields for customer
2021-01-27 16:59:36 +05:30
Saqib Ansari
6f718a31f0
refactor: tax withholding category against customer
2021-01-27 16:59:07 +05:30
Afshan
907e2990d0
fix: remove function to get earning deduction components ( #24465 )
...
* fix: remove function to get earning deduction components
* fix: slider
2021-01-27 15:34:42 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges ( #24474 )
2021-01-27 12:34:08 +05:30
prssanna
2d1d900c88
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-27 10:58:17 +05:30
prssanna
72053cc4ab
fix: cart address overflow
2021-01-27 10:57:34 +05:30
Deepesh Garg
dade7a4583
fix: Translation Syntax
2021-01-26 21:11:55 +05:30
Deepesh Garg
a0d61524c1
fix: Add distribute manually option in LCV
2021-01-26 17:05:00 +05:30
Deepesh Garg
ff3adfd1cf
Merge pull request #24468 from deepeshgarg007/lse_report_fix
...
fix: Division by 0 error in security exposure reports
2021-01-26 10:13:39 +05:30
Deepesh Garg
7a4db2214a
fix: Division by 0 error in security exposure reports
2021-01-26 10:10:35 +05:30
Deepesh Garg
224fdf34e4
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-25 22:16:02 +05:30
Raffael Meyer
1991ba7910
feat: temporary against account ( #24086 )
...
* feat: add temporaray against account nmber to datev settings
* feat: use temporary against account in datev report
* test: add temp against account number to test data
* test: include temp against aaccount in filters
2021-01-25 21:22:10 +05:30
Marica
35455d2de6
Merge branch 'develop' into project-naming-series-patch
2021-01-25 21:16:02 +05:30
marination
b0ef8fb7c5
fix: Always show QI Template in Item
2021-01-25 21:00:24 +05:30
David Angulo
e1e4810a46
feat: Make patient age translateable
2021-01-25 08:29:11 -06:00
rohitwaghchaure
fa3ec3c346
Merge pull request #23969 from marination/putaway
...
feat: Putaway
2021-01-25 16:42:04 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Anupam
8541d9738f
fix: review changes
2021-01-25 14:18:26 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency
2021-01-25 12:39:16 +05:30
Marica
ec4f42d4a9
Merge branch 'develop' into project-naming-series-patch
2021-01-25 11:29:23 +05:30
Deepesh Garg
164079127f
Merge pull request #24446 from deepeshgarg007/patch-fix-1-new
...
fix: Project Template patch
2021-01-25 10:37:43 +05:30
Deepesh Garg
befe32cbe1
Merge pull request #24456 from deepeshgarg007/ltv_in_report
...
fix: Add loan to value field in Loan Interest Report
2021-01-24 19:18:42 +05:30
Deepesh Garg
91eb9bb5c2
fix: Add loan to value field in Loan Interest Report
2021-01-24 19:15:57 +05:30
Kaviya Periyasamy
c680547be3
fix(einvoice): QRCode generation ( #24412 )
2021-01-24 10:59:37 +05:30
rohitwaghchaure
13df7a0ca6
Merge pull request #24033 from ruchamahabal/patient-history-enhancements
...
feat: Patient History Enhancements
2021-01-23 18:19:16 +05:30
Rucha Mahabal
ab920b55a7
Merge branch 'develop' into service-units-in-appointment
2021-01-23 13:27:03 +05:30
Rucha Mahabal
edf5da3394
Merge branch 'develop' into patient-history-enhancements
2021-01-23 13:26:36 +05:30
Rucha Mahabal
ee28328006
fix(travis): Issue Analytics Report Test ( #24453 )
2021-01-23 13:26:24 +05:30
Rucha Mahabal
6f4ad3b73d
fix: sider
2021-01-23 12:52:41 +05:30
Rucha Mahabal
cb1da4d07c
fix: doctype meta not loading while setting up fields
2021-01-22 19:26:56 +05:30
Marica
6b0d334d25
Merge pull request #24399 from pateljannat/item-wise-purchase-registry-item-name-error
...
fix: Item wise purchase registry item_name error
2021-01-22 19:20:51 +05:30
Deepesh Garg
5b4ece5054
fix: Update patch
2021-01-22 17:12:35 +05:30
marination
7ba60570e7
fix: Spaces to Tabs
2021-01-22 16:55:06 +05:30
marination
c908deea61
fix: Patch to Add Naming Series to old projects
2021-01-22 16:10:01 +05:30
Rucha Mahabal
75a93d9057
feat: fetch date field for custom doctypes
2021-01-22 15:51:25 +05:30
Afshan
217440952f
fix: slider
2021-01-22 15:39:59 +05:30
Afshan
02d495f1fb
fix: added query for fetching salary component
2021-01-22 15:39:59 +05:30
prssanna
2aa1efb70e
fix: broken image style
2021-01-22 15:31:38 +05:30
Rucha Mahabal
6058ea88e8
fix: SLA not applied automatically when priority is missing ( #24447 )
2021-01-22 13:35:08 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-22 12:35:35 +05:30
Deepesh Garg
0d26d24164
Merge pull request #24414 from Alchez/dev-irs-1099-year
...
fix: use supplied year for IRS 1099 forms
2021-01-22 12:17:43 +05:30
Deepesh Garg
cf7209f3d4
fix: Project Template patch
2021-01-22 11:47:13 +05:30
Anupam
988ea8d61d
feat: shopping portal changes
2021-01-22 10:53:50 +05:30
Jannat Patel
02a7af1e6c
fix: full form for opportunity in crm dashboard ( #24436 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-22 10:03:29 +05:30
Rucha Mahabal
858ad20dd0
Merge branch 'develop' into service-units-in-appointment
2021-01-22 09:09:29 +05:30
Rucha Mahabal
7201498801
Merge branch 'develop' into patient-history-enhancements
2021-01-22 09:04:37 +05:30
Rucha Mahabal
b9a21c4824
feat: added search to the Select fields dialog in Patient History Settings
2021-01-22 09:00:40 +05:30
Rucha Mahabal
ded08245cc
fix: duplicate filters added on patient change
2021-01-22 08:52:17 +05:30
rohitwaghchaure
3afc6b1333
Merge pull request #24437 from AfshanKhan/fix-stock-ageing
...
fix: stock ageing should not take cancelled stock entries.
2021-01-21 23:09:41 +05:30
Rucha Mahabal
7a21e40527
Merge branch 'develop' into membership-enhancements-2
2021-01-21 20:21:17 +05:30
Rucha Mahabal
02e424fae2
chore: Add description for settings
2021-01-21 20:16:17 +05:30
Rucha Mahabal
bcc0674d37
fix: test
2021-01-21 19:52:13 +05:30
Abhishek Balam
ea30e0a37d
fix: change modified date
2021-01-21 19:38:37 +05:30
Abhishek Balam
ae3a9c1ead
fix: remove payroll card from HR workspace
2021-01-21 19:33:19 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
Suraj Shetty
bed55bb7ba
fix: Use multisql to support postgres
2021-01-21 18:36:50 +05:30
Afshan
96edfd93c9
fix: stock ageing should not take cancelled stock entries.
2021-01-21 18:22:35 +05:30
Rucha Mahabal
eee71f37d8
fix: test
2021-01-21 17:47:20 +05:30
Suraj Shetty
5f52f8d473
fix: Temporarily comment out help article link in issue timeline
2021-01-21 16:50:47 +05:30
Suraj Shetty
8670dda5b7
fix: Use abbr method for abbr
2021-01-21 16:47:04 +05:30
Rucha Mahabal
f1cca59d80
feat: update expiry for memberships
2021-01-21 16:36:15 +05:30
Suraj Shetty
2dcdeb8231
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 15:33:42 +05:30
Suraj Shetty
17ed3fc270
fix: Set css_style fallback
2021-01-21 15:33:36 +05:30
prssanna
f3d321fb82
fix: remove console.log
2021-01-21 15:31:42 +05:30
Rucha Mahabal
b9781a4675
fix: membership test cases
2021-01-21 15:13:29 +05:30
Suraj Shetty
0c0155e885
fix: Make birthday messages translatable
2021-01-21 14:59:19 +05:30
Suraj Shetty
8b1a720ae8
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 14:32:45 +05:30
Suraj Shetty
164fe37fa0
fix: Employee birthday reminder
2021-01-21 14:32:35 +05:30
Rucha Mahabal
f3e3f80102
Merge branch 'develop' into membership-enhancements-2
2021-01-21 13:24:39 +05:30
Rucha Mahabal
d98b506478
fix: patch
2021-01-21 13:23:59 +05:30
prssanna
9f1a156307
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 13:04:58 +05:30
Rucha Mahabal
b48eab972e
fix: sider issues
2021-01-21 13:00:10 +05:30
Marica
d1e6303d67
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-21 12:14:47 +05:30
Rucha Mahabal
3af46cc6cc
fix: show custom buttons after save
2021-01-21 11:59:34 +05:30
Rucha Mahabal
4284ad880b
fix: create member from membership for website users only
2021-01-21 11:54:14 +05:30
Rucha Mahabal
53d0eebbe8
fix: patch for renaming field in Membership Settings
2021-01-20 23:22:08 +05:30
Rucha Mahabal
bc49815d54
refactor: missing validations, code clean-up
2021-01-20 23:14:27 +05:30
Rucha Mahabal
fa4b3ba505
fix: basic validations for Membership Type Linked Item
2021-01-20 21:59:27 +05:30
Rucha Mahabal
3575939386
fix: sider issues
2021-01-20 20:48:51 +05:30
pateljannat
f110759897
fix: date validation
2021-01-20 18:12:48 +05:30
prssanna
b00eb1b0cc
feat: shopping cart page
2021-01-20 17:52:54 +05:30
prssanna
706eae7cac
fix: product page fixes
2021-01-20 17:47:25 +05:30
prssanna
ac7bc78afe
fix: show product price in item card
2021-01-20 17:46:19 +05:30
prssanna
599322871a
fix: product query issues
2021-01-20 17:44:08 +05:30
Afshan
36e3e05a0e
fix: query for salary componet in salary structure
2021-01-20 16:48:42 +05:30
Afshan
912647f4f2
fix: allow statistical component in salary structure.
2021-01-20 13:58:32 +05:30
Saqib
e2ed2324c3
fix: (e-invoicing) qrcode image generation ( #24395 )
...
* fix: invalid taxable value of item for e-invoice
* fix: qrcode image duplicate error
* fix: net total discount calculation
* fix: auto fetch auth token
2021-01-20 13:17:42 +05:30
Rucha Mahabal
bd02a42904
Merge branch 'develop' into membership-enhancements-2
2021-01-20 12:49:37 +05:30
Deepesh Garg
60a8ba5cbd
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-20 10:30:52 +05:30
Suraj Shetty
2e67a41c27
fix: Update birthday avatar code
2021-01-20 10:12:01 +05:30
Afshan
c69ab6d184
fix: select sal comp while making sal struct
2021-01-19 19:29:31 +05:30
Rohan Bansal
97b9995f8f
fix: use supplied year for IRS 1099 forms
2021-01-19 19:10:03 +05:30
rohitwaghchaure
c474caba70
Merge pull request #24354 from rohitwaghchaure/fixed-incorrect-key-in-subcontract-develop
...
fix: incorrect serial no in the subcontracted purchase receipt
2021-01-19 15:08:53 +05:30
Rucha Mahabal
a28579a130
fix: sider issues
2021-01-19 14:16:44 +05:30
Rucha Mahabal
f39cbd3a1d
test: appointment booking for admission service unit
2021-01-19 13:59:03 +05:30
Suraj Shetty
c858bb8122
fix: Rename patch
2021-01-19 10:47:50 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-19 10:44:49 +05:30
Deepesh Garg
6fb66f9428
Merge pull request #24362 from ruchamahabal/year-to-date-in-salary-components
...
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-19 09:40:47 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
marination
957615bec8
fix: Stricter validations
...
- Validation for overreceipt on Purchase Invoice, Stock Entry, Purchase Receipt & Stock Reconciliation
- Every incoming stock transaction must be checked to avoid overcapacity
- However application of rule and splitting only on certain doctypes
- Validate capacity < stock balance on save in putaway rule, irrespective
2021-01-18 23:47:24 +05:30
Marica
6ac51edc56
Merge branch 'develop' into putaway
2021-01-18 17:47:25 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
Suraj Shetty
e560d7428e
fix: Update split issue & help article
2021-01-18 16:43:22 +05:30
pateljannat
6bec696396
fix: item_group fallback
2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd
fix: handled invoices with no item_code
2021-01-18 15:27:40 +05:30
Rucha Mahabal
20e5315480
feat: Allow selecting admission service unit in Patient Appointment for inpatients
2021-01-18 14:56:55 +05:30
Rucha Mahabal
ea19434af4
feat: Issue Analytics Script Report ( #23604 )
...
* feat: Issue Analytics Report
* feat: add more filters, code clean-up
* fix: add report link to desk page
* test: Issue Analytics Report
* fix: sider issues
* fix: test
* debug: travis
* debug: travis
* fix: travis
* fix: travis
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-18 13:53:52 +05:30
Deepesh Garg
c3d82a889a
Merge pull request #24370 from deepeshgarg007/loan_report_and_enhancements
...
feat: Loan report and enhancements
2021-01-18 12:26:45 +05:30
Deepesh Garg
52172252b4
fix: Interest calculations in Loan Interest Report
2021-01-18 12:07:54 +05:30
Deepesh Garg
2cb12e6f70
fix: Loan Security name fetch
2021-01-17 18:38:21 +05:30
Deepesh Garg
dd25ecb70d
fix: Add reports in Desk Page
2021-01-17 17:52:02 +05:30
Deepesh Garg
ec60063155
fix: Auto Loan Write Off
2021-01-17 17:39:51 +05:30
Deepesh Garg
914ab7e4b0
fix: Add filters and currency in reports
2021-01-17 14:40:32 +05:30
Deepesh Garg
addea9697d
feat: Loan Exposure report
2021-01-17 11:36:51 +05:30
Deepesh Garg
7976d12ed0
fix: Applicant-Wise Loan Security Exposure report
2021-01-16 18:10:01 +05:30
Deepesh Garg
1564d6ee1f
fix: Test Case
2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a
fix: test case
2021-01-15 15:57:18 +05:30
Deepesh Garg
e30b33a3b8
fix: Linting issues
2021-01-15 15:47:15 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Suraj Shetty
cde1566606
fix: Typo
2021-01-15 15:28:50 +05:30
Suraj Shetty
f75d1bb043
fix: Typo
2021-01-15 14:53:51 +05:30
Suraj Shetty
22cdfbea87
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-15 14:48:35 +05:30
Suraj Shetty
3d00e25232
refactor: Employee birthday reminder
2021-01-15 14:48:28 +05:30
Kanchan Chauhan
d2c71350cd
refactor(Job Application): New fields in Job Applicant and webform ( #23326 )
...
* refactor(Job Application): New fields in Job Applicant and webform
* fix: translation syntax
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-15 13:56:03 +05:30
Rohan
b1d08126b0
feat: add "Sync Now" to Plaid Settings ( #23602 )
2021-01-15 12:56:30 +05:30
Rucha Mahabal
004e51ed9f
Merge branch 'develop' into patient-history-enhancements
2021-01-15 12:09:53 +05:30
Rucha Mahabal
1873c389e5
feat: Only allow submittable doctypes for Patient Medical Record
2021-01-15 02:12:57 +05:30
Rucha Mahabal
b15a19c6e0
test: Medical Record creation for custom doctypes
2021-01-15 01:27:30 +05:30
Rucha Mahabal
060d647248
fix: travis
2021-01-15 00:19:14 +05:30
Anuja P
47b42e6441
fix: Translation fixes
2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf
fix:Payment Period based on invoice date report fix/refactor
2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13
...
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:44:41 +05:30
Anuja Pawar
4569e52b45
fix: fix for not having fiscal year while creating new company ( #24130 )
...
* fix: Fiscal year fix while creating new company
* fix: for failing Travis
* fix: suggested changes
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:24:30 +05:30
Mohammad Hasnain Mohsin Rajan
00981206ad
fix: last purchase rate not updating when voucher cancelled if only one voucher is present ( #24322 )
...
* fix: last purchase rate not updating
* chore: use orm for updating
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-01-14 19:23:18 +05:30
Deepesh Garg
660d4a1097
Merge pull request #24346 from GangaManoj/timesheet-linking
...
fix: Link timesheets with corresponding projects
2021-01-14 18:49:40 +05:30
Deepesh Garg
3f015f7142
fix: Update fieldnames
2021-01-14 18:44:14 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj
2021-01-14 16:34:51 +05:30
Marica
2b75342811
Merge pull request #24294 from marination/mr-se-warehouse-validation
...
fix: Don't validate warehouse values between Material Request and Stock Entry
2021-01-14 15:09:00 +05:30
Rucha Mahabal
751719ea0d
Merge branch 'develop' into patient-history-enhancements
2021-01-14 14:08:50 +05:30
marination
bc9eaac342
fix: Clear merge conflicts
...
- 'get_project_template' was removed a month back
- in 'make_project' insert the project directly as a check for it is there in the beginning.
2021-01-14 13:47:40 +05:30
Rucha Mahabal
6c90e26982
feat: add descriptions for YTD and MTD fields
2021-01-14 13:42:40 +05:30
Marica
17614c9860
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-14 13:02:45 +05:30
Rucha Mahabal
6b9efa894f
Merge branch 'develop' into inpatient-visits-billing
2021-01-14 12:31:43 +05:30
marination
814858061f
fix: test for raising MR-SE mismatch error
...
- Make test add mismatched item code instead of warehouse, since warehouse can be different.
2021-01-14 12:13:08 +05:30
Rucha Mahabal
49702c1487
test: year to date computation for salary slip components
2021-01-14 11:57:24 +05:30
Rohit Waghchaure
56c7b554a6
fix: extra transferred qty has not consumed against work order
2021-01-14 11:54:32 +05:30
Rucha Mahabal
2c315a738e
feat: Salary Slip with Year to Date Print Format
2021-01-14 10:06:24 +05:30
Rucha Mahabal
fdad94f983
feat(Payroll): compute Year to Date for Salary Slip components
2021-01-14 00:40:58 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Anupam Kumar
4a649a4fce
fix: removing payment_field from loan repayment closuer ( #24291 )
2021-01-13 21:10:49 +05:30
Afshan
33fac19bce
fix: calculation of remaining_sub_periods if relieving date before month start date ( #24319 )
2021-01-13 21:06:04 +05:30
Anuja Pawar
0b04e23f6d
fix: BOM Stock Report UoM correction ( #24339 )
2021-01-13 21:04:03 +05:30
Jannat Patel
00ccec7314
fix: subscription prepaid date validation ( #24356 )
2021-01-13 21:02:15 +05:30
Saqib
53cb9f9f47
fix(e-invoicing): ux issues ( #24358 )
...
* fix: overseas invoice rounding adjustment
* fix: overseas shipping address
* fix: qrcode for document name having forward slash
* feat: sandbox mode toggle
* fix: cannot delete sales invoice if linked to e invoice req log
2021-01-13 21:00:44 +05:30
Kanchan Chauhan
511434190d
fix(work order): Actual start and end dates update ( #24360 )
...
Currently, even when the Work Order (without Operations) is completed and Stock Entries are there, the Actual Start Date and Actual End Date is not updated.
For some reason need to db_set, then it updates the Actual Start Date and Actual End Date
2021-01-13 20:59:43 +05:30
Rucha Mahabal
ef5f0c0461
feat: Issue Summary Script Report ( #23603 )
...
* feat: Issue Summary Report
* feat: Add Issue Metrics to Issue Summary Report
* fix: code clean-up
* feat: Added Report Summary
* feat: Add SLA status fields
* fix: add report link to desk page
* fix: sider issues
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-13 19:59:16 +05:30
Anurag Mishra
1e396dcb2a
fix: validated GST state
2021-01-13 14:01:57 +05:30
Jannat Patel
8aeadc743e
fix: assessment plan error handling for course field ( #23961 )
...
* fix: assessment plan error handling for course field
* fix: message rectification
* fix(travis): clean-up tests
* fix: travis
* fix: tests
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-13 12:56:04 +05:30
Marica
1ff7743d81
Merge branch 'develop' into naming-series-proj
2021-01-13 10:40:24 +05:30
rohitwaghchaure
1c362c81f2
Merge pull request #24324 from marination/bom-rm-rate-company-based
...
fix: Company Wise Valuation Rate for RM in BOM
2021-01-13 10:39:39 +05:30
Rucha Mahabal
0f05925ff4
test: Do Not Bill Patient Encounters for Inpatients
2021-01-13 09:46:33 +05:30
Rucha Mahabal
1354197c72
feat(Healthcare Settings): Do Not Bill Patient Encounters for Inpatients
2021-01-13 09:12:50 +05:30
Rohit Waghchaure
7cd7bf7f96
fix: incorrect key
2021-01-13 00:13:57 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop
...
fix: payment entry multi-currency issue
2021-01-13 00:13:14 +05:30
Marica
b8c5cd7331
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-12 20:16:58 +05:30
Marica
30cc040d50
Merge branch 'develop' into batch-selector
2021-01-12 20:14:35 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj
2021-01-12 19:57:55 +05:30
Marica
69f66664ce
Merge branch 'develop' into qi-reading-status
2021-01-12 19:32:47 +05:30
Anurag Mishra
36fa0512d2
fix: not able to create dunning from sales invoice
2021-01-12 17:02:19 +05:30
Deepesh Garg
59e2114419
Merge pull request #24311 from wojosc/patch-14
...
fix: Update item_tax_template_dashboard.py
2021-01-12 13:09:35 +05:30
Rushabh Mehta
b6c7ba2eea
fix(minor): Rename loan workspace to loan management for naming
2021-01-12 11:34:11 +05:30
Deepesh Garg
7fd2b35a7d
Merge pull request #24092 from pateljannat/project-template-and-tasks
...
feat: Project template with dependent tasks
2021-01-12 11:28:35 +05:30
Marica
69abc27316
Merge branch 'develop' into qi-reading-status
2021-01-12 11:15:36 +05:30
Anupam
c53ad88503
fix: resolved commit
2021-01-12 10:51:29 +05:30
Rushabh Mehta
37aa81526a
fix(minor): clear merge conflicts
2021-01-12 10:29:00 +05:30
Marica
0600d572ba
Merge branch 'develop' into batch-selector
2021-01-12 10:28:47 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
Rucha Mahabal
80911577f5
Merge pull request #24340 from ruchamahabal/make-ipme-entries-editable
...
fix: allow medication entries to be deleted from the table
2021-01-11 17:59:02 +05:30
rohitwaghchaure
c92da35997
Merge pull request #22944 from anupamvs/opportunity-status
...
fix: Opportunity Status fix
2021-01-11 17:34:06 +05:30
Rucha Mahabal
8549358708
Merge branch 'develop' into make-ipme-entries-editable
2021-01-11 15:31:08 +05:30
Marica
aef71a8abe
Merge branch 'develop' into batch-selector
2021-01-11 14:22:11 +05:30
Marica
cffc489d57
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-11 13:39:49 +05:30
Saqib
d43bb4db41
fix(pos): error while merging pos invoices into sales invoice ( #24337 )
2021-01-11 12:59:35 +05:30
marination
7646d7b741
fix: Batch/Serial Selector for Batched Item
2021-01-11 12:51:15 +05:30
Jannat Patel
dcda8b9e8c
feat: Patient appointment status changes ( #24201 )
...
* feat: patient appointment status changes
* fix: sider
* fix: sider
* fix: test status on cancel of docs and test refactor
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2021-01-11 12:50:39 +05:30
Rucha Mahabal
aff3f611d3
fix: allow medication entries to be deleted from the table
2021-01-11 12:48:11 +05:30
Jannat Patel
8a07de9ee0
Merge branch 'develop' into project-template-and-tasks
2021-01-11 10:57:09 +05:30
pateljannat
2460e101a7
fix: indicator ofor template task
2021-01-11 10:05:54 +05:30
Deepesh Garg
d3634f6dac
feat: Loan Interest Report
2021-01-10 19:26:45 +05:30
Deepesh Garg
1b208e0695
fix: Add total loan interest amount field in loans
2021-01-10 12:29:55 +05:30
Ganga Manoj
2ffa4b9ce4
fix: Link timesheets with corresponding projects
2021-01-08 20:58:00 +05:30
Marica
b9d5ae9285
Merge branch 'develop' into qi-ux
2021-01-08 20:28:28 +05:30
Marica
63a91fc742
Merge branch 'develop' into qi-ux
2021-01-08 18:42:54 +05:30
Marica
ace08b1e48
Merge branch 'develop' into qc-back-update-se
2021-01-08 18:42:19 +05:30
marination
b7637f49cd
fix: Remove QI link on cancel wherever same QI name exists
2021-01-08 18:35:49 +05:30
Anurag Mishra
05f6edfe0a
Merge branch 'develop' into fixed-payment-entry-multi-currency-issue-develop
2021-01-08 17:27:22 +05:30
Rushabh Mehta
f8a6dde8d8
fix(minor): routing
2021-01-08 14:37:38 +05:30
Rohit Waghchaure
3777c6aa38
fix: payment entry multi-currency issue
2021-01-08 12:59:15 +05:30
Rucha Mahabal
a93151502c
fix: Components formulated from additional salary not being fetched in Payroll Entry
2021-01-08 12:10:26 +05:30
marination
c4963bfdb2
fix: Back Update from QC based on Batch No
2021-01-08 09:56:04 +05:30
marination
ff6ee9d4e7
fix: Formula field description and Rearrange grid view
...
- Missing closing quote in Formula field description
- In grid view of child table in QI, show only input fields
2021-01-08 09:14:43 +05:30
Leela vadlamudi
df9144c198
feat: Voice Call Settings doctype added ( #24126 )
...
(cherry picked from commit 29778e2fba
2021-01-07 17:20:40 +05:30
Marica
5cfdd0f503
Merge branch 'develop' into qi-ux
2021-01-07 15:47:55 +05:30
Marica
d91c7e2b38
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-07 15:41:21 +05:30
marination
fab080c875
fix: Company Wise Valuation Rate for RM in BOM
2021-01-07 15:25:39 +05:30
pateljannat
fd5ebe9d4a
fix: patch and columns
2021-01-07 15:16:15 +05:30
Jannat Patel
a586b0ba17
Merge branch 'develop' into project-template-and-tasks
2021-01-07 13:01:02 +05:30
pateljannat
3c55463b4b
fix: validation for ldc against supplier and section code
2021-01-07 12:41:44 +05:30
Anurag Mishra
77ba72c4ff
Merge branch 'develop' into payroll_fixes2.0
2021-01-06 14:23:53 +05:30
Anurag Mishra
e7fa6f6a1c
fix: edditable employee grid
2021-01-06 13:25:09 +05:30
Shivam Mishra
9fc44f1606
Merge pull request #24182 from scmmishra/fix-dont-set-primary
2021-01-06 12:52:44 +05:30
Jannat Patel
5a579089c2
fix: indentation
2021-01-06 11:21:13 +05:30
Deepesh Garg
5e15a5d230
Merge pull request #24186 from frappe/validate_regional_germany
...
fix: regional validation of sales invoice (germany)
2021-01-06 09:35:05 +05:30
Deepesh Garg
e72c51204b
Merge pull request #24189 from timgates42/bugfix_typo_update
...
docs: fix simple typo, udpate -> update
2021-01-06 09:34:11 +05:30
Deepesh Garg
f2863f9d16
Merge pull request #24313 from deepeshgarg007/ytd_error_fix_v13
...
fix: Consider only submitted salary slips
2021-01-06 09:30:00 +05:30
Deepesh Garg
ad8be7c1fe
fix: Consider only submitted salary slips
2021-01-06 09:29:03 +05:30
Rucha Mahabal
a7a609d4ff
Merge pull request #24281 from ruchamahabal/allow-discharge
...
feat: Allow Discharge despite Unbilled Healthcare Services
2021-01-06 09:27:26 +05:30
Deepesh Garg
6f18d4c0f6
Merge pull request #24312 from deepeshgarg007/sanctioned_loan_unpledge
...
fix: Sanctioned loan security unpledge
2021-01-06 09:13:19 +05:30
Deepesh Garg
05fe7ac29c
fix: fieldname
2021-01-06 09:10:28 +05:30
Deepesh Garg
dd768a07c5
fix: Sanctioned loan security unpledge
2021-01-05 23:55:00 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py
...
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
2021-01-05 18:47:11 +01:00
Nabin Hait
f7b9b0687e
fix: tax calculation on salary slip for the first month ( #24272 )
...
* fix: tax calculation on salary slip for the first month
* fix: net pay precision issue
* fix: net pay precision issue
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
2021-01-05 20:43:11 +05:30
Deepesh Garg
b01b108dfa
fix: do not consider current salary slip in sum
2021-01-05 17:34:16 +05:30
Saurabh
994fa48cd4
Merge branch 'develop' into fix-dont-set-primary
2021-01-05 16:32:56 +05:30
Saqib
80e0952ba7
refactor: fetch & validate address from erpnext rather than gst portal
2021-01-05 16:04:25 +05:30
Saqib
a56a5ccefa
refactor: fetch & validate address from erpnext rather than gst portal ( #24297 )
2021-01-05 15:59:17 +05:30
Marica
ba6e50b15e
Merge branch 'develop' into qi-ux
2021-01-05 15:15:10 +05:30
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Anurag Mishra
112b3894cc
Merge pull request #24296 from AfshanKhan/fix-add-comp-in-leave-ledger
...
fix: set company in leave allocation and leave ledger entry
2021-01-05 14:45:16 +05:30
Marica
eab1867235
Merge branch 'develop' into qi-ux
2021-01-05 14:23:05 +05:30
Anurag Mishra
239fe7336e
fix: charts not displaying when tree_type changed
...
fix: charts not displaying when tree_type changed
2021-01-05 14:03:03 +05:30
Saqib
60460a6d23
fix(e-invoicing): minor calculation fixes ( #24282 )
2021-01-05 13:54:04 +05:30
Saqib
1f591ab02e
fix(e-invoicing): minor calculation fixes ( #24285 )
2021-01-05 13:53:51 +05:30
Afshan
f79c4d3560
Merge branch 'develop' into fix-add-comp-in-leave-ledger
2021-01-05 13:27:15 +05:30
Jannat Patel
16a809483b
fix: indentation
2021-01-05 12:28:45 +05:30
marination
b8aeb9ea88
fix: Indentation and missing semi-colon
...
- Fix incorrect indentation after merge conflict
- Sider
2021-01-05 12:16:25 +05:30
Rucha Mahabal
d643bb7c4b
Merge branch 'develop' into allow-discharge
2021-01-05 12:07:26 +05:30
Jannat Patel
06a401ffbf
fix: incoming rate attribute error ( #24287 )
...
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2021-01-05 11:54:34 +05:30
Marica
41ea77ce31
Merge branch 'develop' into putaway
2021-01-05 11:24:05 +05:30
Marica
95344f01e6
Merge branch 'develop' into qi-ux
2021-01-05 10:44:52 +05:30
Jannat Patel
7d0f35c4ab
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2021-01-05 10:42:30 +05:30
Rucha Mahabal
f97e668130
Merge branch 'develop' into allow-discharge
2021-01-05 10:38:16 +05:30
Deepesh Garg
bfa71c23ae
Merge pull request #23965 from vorasmit/remarks-fix-develop
...
fix: add remarks to sales invoice
2021-01-05 09:54:53 +05:30
Nabin Hait
72fa368e8f
Merge branch 'develop' into mr-se-warehouse-validation
2021-01-05 09:30:16 +05:30
Nabin Hait
5a8f141eda
Merge branch 'develop' into fix-add-comp-in-leave-ledger
2021-01-05 09:29:44 +05:30
Marica
099162814c
Merge branch 'develop' into qi-ux
2021-01-05 09:27:40 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions ( #24279 )
...
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
2021-01-05 09:23:39 +05:30
Afshan
0da201c6a5
fix: set company in leave allocation and leave ledger entry
2021-01-04 19:04:05 +05:30
marination
0c883853b3
fix: Dont validate warehouse values between MR to Stock Entry
...
- Remove validation thta checks if warehouse in Stock Entry is the same as MR that it was pulled from
2021-01-04 18:48:50 +05:30
Anupam
27fd9e4d7d
fix: added empty value in Quality Inspection Reading status
2021-01-04 18:18:00 +05:30
Deepesh Garg
797a742cb2
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-04 14:24:00 +05:30
Deepesh Garg
a873ae0d9f
fix: Check for custom dimensions
2021-01-04 14:23:31 +05:30
Rucha Mahabal
7206e12c2f
test: Allow Discharge despite Unbilled Services
2021-01-04 12:11:00 +05:30
Rucha Mahabal
03b25be9e9
feat: Allow Discharge despite Unbilled Healthcare Services
2021-01-04 11:16:59 +05:30
marination
7877d5a7c2
fix: Create QI Parameters (links) in test cases
2021-01-04 11:10:04 +05:30
Saurabh
0feaab5261
bumped to version 13.0.0-beta.9
2021-01-02 20:19:56 +05:50
Afshan
a245f667d0
fix: pos error pop up ( #24237 )
2021-01-02 10:30:22 +05:30
Deepesh Garg
ffca52a348
Merge pull request #24254 from nextchamp-saqib/loan-patch-fix
...
fix: update old loan patch
2021-01-01 13:50:52 +05:30
vorasmit
3ef965f253
Update patches.txt
2021-01-01 10:55:20 +05:30
vorasmit
8c39ab68df
Delete update_sales_invoice_remarks.py
2021-01-01 10:54:57 +05:30
Anurag Mishra
b901d4002a
Merge pull request #24264 from AfshanKhan/fix-sal-struc-assign-payroll-acc
...
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 18:26:46 +05:30
Afshan
47bc42740b
Merge branch 'develop' into fix-sal-struc-assign-payroll-acc
2020-12-31 17:41:44 +05:30
Afshan
4edcf813e7
Merge branch 'develop' into allow-cancel-leave-policy
2020-12-31 17:41:34 +05:30
Rohit Waghchaure
16bce49f18
fix: incorrect valuation rate for finished good
2020-12-31 17:39:52 +05:30
Anurag Mishra
d7ea2bd705
Merge pull request #24177 from AfshanKhan/fix-perm-empl-sal-slip
...
fix: error popup for submitted doc
2020-12-31 17:07:30 +05:30
Afshan
e69148c266
fix: allow leave policy assignment to be cancelled.
2020-12-31 16:45:00 +05:30
Afshan
8b60fe6125
fix: setting correct account for sal struct assignment if not specified.
2020-12-31 16:10:39 +05:30
Saqib
f8f015c961
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:28:08 +05:30
Saqib
2b67d57480
fix: cannot submit e-invoice if legal name not found
2020-12-31 13:26:05 +05:30
Saqib Ansari
d5d571ab9d
fix: update old loan patch
2020-12-31 12:55:35 +05:30
Saurabh
08b89d1ce0
bumped to version 13.0.0-beta.8
2020-12-31 12:12:58 +05:50
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Deepesh Garg
23ab5c5cc0
fix: Multiplle sider issues
2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-31 11:24:14 +05:30
Deepesh Garg
f57089532a
Merge pull request #24252 from deepeshgarg007/partial_security_unpledge
...
fix: Partial loan security unpledging
2020-12-30 21:37:52 +05:30
Mohammad Hasnain Mohsin Rajan
11176852eb
Merge branch 'develop' into bugfix_typo_update
2020-12-30 20:59:38 +05:30
Deepesh Garg
9716216632
fix: check for string types
2020-12-30 20:33:35 +05:30
Deepesh Garg
a60707873c
fix: Partial loan security unpledging
2020-12-30 20:24:15 +05:30
Karthikeyan S
a25cb9a563
fix(GST E Invoice): update live URLs for adaequare GSP ( #24251 )
2020-12-30 19:41:00 +05:30
Karthikeyan S
aa44c754de
fix(GST E Invoice): update live URLs for adaequare GSP ( #24248 )
2020-12-30 19:22:37 +05:30
Deepesh Garg
5891b48cf6
Merge pull request #24176 from GangaManoj/Year-to-Date
...
feat: Add year_to_date field (cumulative salary for a fiscal year)
2020-12-30 16:53:47 +05:30
rohitwaghchaure
bb0fd33ac5
Merge pull request #24169 from Anurag810/payroll-entry-fixes
...
fix: allow addition and removal of employee in payroll Entry
2020-12-30 16:50:02 +05:30
Shivam Mishra
45a56288bb
feat: style adjustments to product page
2020-12-30 15:51:50 +05:30
Shivam Mishra
31a651365d
feat: update item group website slider
2020-12-30 15:51:34 +05:30
Deepesh Garg
66dcaf3ab2
fix: Salary structure assignment in tests
2020-12-30 15:47:22 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Deepesh Garg
97d055dfc3
fix: Test Case
2020-12-30 14:06:13 +05:30
Anurag Mishra
b7631af741
Merge branch 'develop' into payroll-entry-fixes
2020-12-30 13:22:13 +05:30
Deepesh Garg
8b7ebe5044
fix: Test Case cleanup and fixes
2020-12-30 12:45:46 +05:30
Deepesh Garg
20133bd1df
fix: Remove comments
2020-12-29 22:19:12 +05:30
Deepesh Garg
7e4eacba8d
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 22:13:55 +05:30
Deepesh Garg
353f8f4d85
fix: Add test case for YTD
2020-12-29 22:13:40 +05:30
Anurag Mishra
15af7a4afc
Merge pull request #24226 from AfshanKhan/asset-report
...
fix: asset depreciation ledger
2020-12-29 18:58:56 +05:30
Deepesh Garg
60b77f9865
Merge branch 'develop' of https://github.com/frappe/erpnext into Year-to-Date
2020-12-29 18:26:32 +05:30
rohitwaghchaure
b09ddc4672
Merge pull request #24233 from rohitwaghchaure/back-dates-allow-field-issue
...
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 17:52:43 +05:30
Shivam Mishra
355943c3a0
feat: only show attributes that have an item
2020-12-29 17:46:18 +05:30
Shivam Mishra
2a6c4ec26e
chore: remove dead code
2020-12-29 17:20:12 +05:30
Shivam Mishra
565b178721
feat: use ProductFiltersBuilder in all products page
2020-12-29 17:18:58 +05:30
Shivam Mishra
7055969ef3
feat: update item group template
2020-12-29 17:18:41 +05:30
Shivam Mishra
425bae8bf6
feat: use ProductQuery and ProductFiltersBuilder to build item group page
2020-12-29 17:18:22 +05:30
Shivam Mishra
298608ef40
feat: add product filters generator for item group and all products
2020-12-29 17:17:44 +05:30
Shivam Mishra
ed21350871
fix: page limit filter bug
2020-12-29 17:17:18 +05:30
Shivam Mishra
2dd26f7551
chore: cleanup product query
2020-12-29 17:17:03 +05:30
Shivam Mishra
b06ed4908f
feat: add filter tables in item group
2020-12-29 17:16:29 +05:30
Shivam Mishra
134f6b1b6c
chore: update style rules
2020-12-29 17:16:08 +05:30
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +05:30
Raffael Meyer
a3462f6b0c
Merge branch 'develop' into validate_regional_germany
2020-12-29 11:58:57 +01:00
Rohit Waghchaure
81285204dc
fix: option name for the field 'Role Allowed to Create/Edit Back-dated Transactions'
2020-12-29 16:25:45 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
Shivam Mishra
aa42886851
fix: template json
2020-12-29 13:28:35 +05:30
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +05:30
Anurag Mishra
5af8d2b883
Merge branch 'develop' into payroll-entry-fixes
2020-12-29 13:09:42 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
marination
a69e81a151
chore: Made 'Parameter' a link field in QI and QI Template
...
- Added doctype Quality Inspection Parameter
- Made 'Parameter' a link field in QI and QI Template
- Added patch to create Quality Inspection Parameter records for every parameter in the system
2020-12-28 18:07:22 +05:30
marination
29a03bd5a1
feat: Add 'Manual Inspection' checkbox
...
- fix merge conflict in js file
- Dont auto set status if manual inspection is checked
- Added 'Manual Inspection' checkbox in QI readings table
2020-12-28 16:59:13 +05:30
pateljannat
88471854d5
fix: sider
2020-12-28 15:40:23 +05:30
rohitwaghchaure
527b7e16e5
Revert "feat: Batch wise item selling pricing"
2020-12-28 15:29:30 +05:30
Marica
62f9cc6c5a
Merge branch 'develop' into qi-ux
2020-12-28 15:09:15 +05:30
rohitwaghchaure
72e8ec5eee
Merge pull request #24087 from deepeshgarg007/batch-wise-pricing
...
feat: Batch wise item selling pricing
2020-12-28 14:37:33 +05:30
Rohit Waghchaure
40d2c6a0cc
fix: finished good produced qty validation
2020-12-28 14:08:45 +05:30
pateljannat
aa8ff81061
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-28 12:35:27 +05:30
pateljannat
71f203dbc5
fix: template task status, subject in project template task
2020-12-28 12:35:19 +05:30
Shivam Mishra
c640065a66
feat: cleanup json
2020-12-28 12:16:29 +05:30
Rucha Mahabal
e1b9707ec1
Merge pull request #24152 from ruchamahabal/fix-therapy-type-filter
...
fix: filter Therapy Types and Therapy Plan in Patient Appointment
2020-12-28 11:36:34 +05:30
Deepesh Garg
d3814b2676
Merge branch develop into batch-wise-pricing
2020-12-28 10:48:29 +05:30
Jannat Patel
c09100d738
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-28 10:20:27 +05:30
Deepesh Garg
7c300859ed
fix: Test Cases
2020-12-26 20:14:51 +05:30
Deepesh Garg
d4fc451c2a
Merge pull request #24191 from nextchamp-saqib/accounting-entries-for-asset
...
fix: accounting entries of asset when submitting purchase receipt
2020-12-26 19:14:32 +05:30
Saurabh
d1d030b54a
bumped to version 13.0.0-beta.7
2020-12-26 15:15:51 +05:50
Saqib
60a1d25196
fix: cancelling of asset value adjustement ( #24193 )
2020-12-26 13:01:49 +05:30
rohitwaghchaure
9f1e1f6c23
Merge pull request #24207 from rohitwaghchaure/fixed-serial-no-return-issue
...
fix: partial serial no return issue
2020-12-26 12:12:04 +05:30
Deepesh Garg
4f8da4c313
fix: Test Cases
2020-12-26 11:37:51 +05:30
Nabin Hait
af1af925ac
chore: Added change log ( #24213 )
2020-12-26 11:09:46 +05:30
Saqib
17e96901db
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 20:55:21 +05:30
Nabin Hait
0788df412c
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:54:01 +05:30
Nabin Hait
f8c1cb5dc3
fix: Removed permissions from UAE VAT Settings
2020-12-25 20:53:18 +05:30
Deepesh Garg
5269f02919
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-25 18:35:26 +05:30
Deepesh Garg
bfc17e487c
fix: Commonify code for Stock Entry
2020-12-25 18:34:39 +05:30
rohitwaghchaure
49d7499990
fix: added shipment link in delivery note dashboard ( #24210 )
...
* fix: added shipment link in delivery note dashboard
* Update shipment.py
2020-12-25 18:15:35 +05:30
rohitwaghchaure
0917c1ec7c
fix: travis failing ( #24211 )
2020-12-25 18:13:12 +05:30
Nabin Hait
b99c77b753
Reposting fixes ( #24202 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:12:35 +05:30
Nabin Hait
327f03566a
Reposting fixes pre release ( #24203 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:11:54 +05:30
hasnain2808@gmail.com
46d5f4c7f1
refactor(analytics report): linting
2020-12-25 16:34:43 +05:30
rohitwaghchaure
fa0a075e95
Merge pull request #24196 from scmmishra/fix-file-url-employee
...
fix: use file_url to save file and not file name
2020-12-25 16:22:15 +05:30
rohitwaghchaure
ebcd4c454e
Merge pull request #24209 from rohitwaghchaure/added-shipment-link-in-delivery-note
...
fix: added shipment link in delivery note dashboard
2020-12-25 16:07:35 +05:30
Rohit Waghchaure
dab1ab990d
fix: partial serial no return issue
2020-12-25 15:25:16 +05:30
rohitwaghchaure
de10d7dcf2
Update shipment.py
2020-12-25 15:15:55 +05:30
Rohit Waghchaure
5bcc6c6b15
fix: added shipment link in delivery note dashboard
2020-12-25 15:02:53 +05:30
rohitwaghchaure
fc01a838b5
Merge pull request #24208 from rohitwaghchaure/fixed-serial-no-return-issue-v13
...
fix: partial serial no return issue
2020-12-25 13:32:36 +05:30
Rohit Waghchaure
adc369f726
fix: partial serial no return issue
2020-12-25 13:28:47 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin
...
fix: multiple pricing rule with margin type as Percentage is not working
2020-12-25 09:33:39 +05:30
Rohit Waghchaure
ba5b603a0b
fix: multiple pricing rule with margin type not working
2020-12-24 22:49:38 +05:30
Rohit Waghchaure
aea62da544
fix: multiple pricing rule with margin type not working
2020-12-24 22:44:31 +05:30
Shivam Mishra
c54aca3f44
chore: cleanup comments
2020-12-24 18:02:50 +05:30
Shivam Mishra
a90b6a73dd
fix: syntax error
2020-12-24 18:02:07 +05:30
Shivam Mishra
419c889a9a
feat: add docstrings
2020-12-24 17:58:18 +05:30
Shivam Mishra
293f483cb4
feat: add ProductQuery engine
2020-12-24 17:54:07 +05:30
rohitwaghchaure
b9352b729a
Merge pull request #24063 from rohitwaghchaure/fixed-job-card-cacncel-flow-develop
...
fix: don't cancel job card if manufacturing entry has made
2020-12-24 17:46:45 +05:30
rohitwaghchaure
630258f493
Merge pull request #24164 from rohitwaghchaure/do-not-manufacture-same-serial-no-two-develop
...
fix: do not manufacture same serial no multiple times
2020-12-24 17:46:26 +05:30
Rucha Mahabal
d013d94e8d
Merge branch 'develop' into fix-therapy-type-filter
2020-12-24 17:44:25 +05:30
Rohit Waghchaure
304100db3b
fix: don't cancel job card if manufacturing entry has made
2020-12-24 16:36:37 +05:30
Rohit Waghchaure
ed20819432
fix: travis
2020-12-24 16:24:10 +05:30
Shivam Mishra
d0437cfb59
feat: clear document cache on validate
2020-12-24 14:15:09 +05:30
Shivam Mishra
bba2726333
fix: minor styling fixes
2020-12-24 14:14:17 +05:30
Anurag Mishra
527a156512
feat: validated employees whose salary has been already precessed
2020-12-24 13:59:12 +05:30
Jannat Patel
29dd7e5fc4
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-24 13:44:42 +05:30
prssanna
eb0e596d43
feat: store home page and product page
2020-12-24 11:40:33 +05:30
prssanna
7a38f41350
Merge branch 'shopping-cart' of https://github.com/frappe/erpnext into shopping-cart
2020-12-24 11:39:41 +05:30
prssanna
79c3d6f71d
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into shopping-cart
2020-12-24 11:36:59 +05:30
Rucha Mahabal
9fe7f235d0
fix: Do not cancel reference document on Quality Inspection cancellation ( #24198 )
2020-12-24 11:03:48 +05:30
Rucha Mahabal
d2f91e8c11
fix: Do not cancel reference document on Quality Inspection cancellation ( #24197 )
2020-12-24 11:03:36 +05:30
Rushabh Mehta
ab1c2b7631
fix(minor): routing
2020-12-23 23:26:58 +05:30
Anurag Mishra
3278d02cd2
fix: sider
2020-12-23 18:07:54 +05:30
Anurag Mishra
1446749b63
fix: changes requested
2020-12-23 18:07:54 +05:30
Nabin Hait
eb065d6d40
fix: fixed gl entries
2020-12-23 18:07:54 +05:30
Nabin Hait
4da7a15ac0
fix: Fixed typo
2020-12-23 18:07:54 +05:30
Anurag Mishra
b71611dd3d
feat: Added Form dashboard
2020-12-23 18:07:54 +05:30
Anurag Mishra
4cc333996c
fix: test
2020-12-23 18:07:54 +05:30
Anurag Mishra
ba6ff6e227
fix: conflict
2020-12-23 18:07:53 +05:30
Anurag Mishra
708065cb85
fix: test cases
2020-12-23 18:07:53 +05:30
Anurag Mishra
af9f172be8
fix: requested changes and sider
2020-12-23 18:07:53 +05:30
Anurag Mishra
66b697cd05
feat: fix test for Gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
550e60a69d
feat: fix test for Gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
b88af3a3f7
feat: Accrural Entry for Gratuity beafore Payment
2020-12-23 18:07:53 +05:30
Anurag Mishra
78fdd5d9b4
fix: update status on salary Slip submission
2020-12-23 18:07:53 +05:30
Anurag Mishra
46e1c09b45
style: Broken into smaller function
2020-12-23 18:07:53 +05:30
Anurag Mishra
4d6c3c9449
Fix: Changes Requested, Sider, codacy, Transalation
2020-12-23 18:07:53 +05:30
Anurag Mishra
493eea19e8
feat: added link from desk page and some minor fixes
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
f63df91186
patch: to create standard Gratuity Rule for india and UAE
2020-12-23 18:07:53 +05:30
Anurag Mishra
e1464a7bf0
feat: Indian Standard Gratuity Rule
2020-12-23 18:07:06 +05:30
Anurag Mishra
34a7250a2d
fix: Some enhancements and better validation
2020-12-23 18:07:06 +05:30
Anurag Mishra
0761301c2e
feat: Added all 3 standard slab for UAE
2020-12-23 18:07:06 +05:30
Anurag Mishra
47f3a3a5bd
feat: validation for if no slab found
2020-12-23 18:07:06 +05:30
Anurag Mishra
6f1538026a
feat: added minimum year for gratuity and condition utilisation
2020-12-23 18:07:06 +05:30
Anurag Mishra
30299c6f49
feat: validating and ordeing the rule slabr
2020-12-23 18:07:06 +05:30
Anurag Mishra
dedc0015c0
feat(HR): Working day calulation based on attendance or Leave
2020-12-23 18:07:06 +05:30
Anurag Mishra
49b326fc08
feat(HR): Gratuity Payment
2020-12-23 18:07:05 +05:30
Anurag Mishra
fc2cb3a85e
Feat: gratuity
2020-12-23 18:07:05 +05:30
Deepesh Garg
aa7ab211be
Merge pull request #24171 from deepeshgarg007/breadcrum_schema
...
fix: Add breadcrumbs to item group page
2020-12-23 16:52:48 +05:30
Shivam Mishra
1ab4f09ee9
fix: use file_url to save file and not file name
2020-12-23 15:18:41 +05:30
Anurag Mishra
d884216c6f
fix: leave policy dashboard fix
...
fix: leave policy dashboard fix
2020-12-23 13:19:12 +05:30
Anurag Mishra
d556847fca
fix: allow addition and removal of employee in payroll Entry
2020-12-23 12:59:48 +05:30
Nabin Hait
0411a43c6e
fix: set finished good item rate based on qty
2020-12-23 12:14:41 +05:30
Afshan
adf9b49e14
fix: sal slip popup error
2020-12-23 11:39:38 +05:30
Saqib Ansari
09c6842199
fix: accounting entries of asset when submitting purchase receipt
2020-12-23 11:29:26 +05:30
Tim Gates
1fb412e3f6
docs: fix simple typo, udpate -> update
...
There is a small typo in erpnext/patches/v4_0/map_charge_to_taxes_and_charges.py.
Should read `update` rather than `udpate`.
2020-12-23 11:39:37 +11:00
barredterra
df8ea19406
fix: whitespace
2020-12-22 17:34:31 +01:00
barredterra
2acd8cbc02
fix: sider
2020-12-22 17:34:22 +01:00
Jannat Patel
b07914d185
Merge branch 'develop' into project-template-and-tasks
2020-12-22 20:47:30 +05:30
pateljannat
8dec1c142f
fix: removed unused imports
2020-12-22 19:55:31 +05:30
Deepesh Garg
e5e2ad646a
fix: Test Cases
2020-12-22 19:53:07 +05:30
pateljannat
6cf018c762
fix: holiday update in tests
2020-12-22 19:40:41 +05:30
pateljannat
4ebee5014e
feat: aholiday check before setting start and end date in task
2020-12-22 18:14:46 +05:30
barredterra
511be6466d
Revert "fix: fail silently"
...
This reverts commit 6900a79421
2020-12-22 11:43:33 +01:00
barredterra
a69021018a
test: add test for accounts controller
2020-12-22 11:38:09 +01:00
barredterra
5adbe49ca6
refactor: translation syntax
2020-12-22 11:37:43 +01:00
barredterra
6900a79421
fix: fail silently
2020-12-22 11:37:13 +01:00
Deepesh Garg
e1320c7e47
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-22 13:32:59 +05:30
Deepesh Garg
468f67a4de
fix: Add parent for all-products page
2020-12-22 12:44:09 +05:30
Mohammad Hasnain Mohsin Rajan
61b92b312a
Merge branch 'develop' into fix-analytics-reports
2020-12-22 12:41:43 +05:30
Shivam Mishra
46bc7ca69f
feat: use call icon
2020-12-22 12:32:36 +05:30
Shivam Mishra
64fa0e8729
fix: wrap assignees in a list
2020-12-22 12:32:36 +05:30
barredterra
1725fbc59a
feat: separate equity tree in CoA SKR04
2020-12-22 12:32:36 +05:30
Rucha Mahabal
7574a14d57
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-22 12:32:36 +05:30
Rucha Mahabal
5f53b140e2
fix: Auto Repeat Import ( #24157 )
2020-12-22 12:32:36 +05:30
Rucha Mahabal
7d848b1785
refactor: Auto Repeat next schedule date function params ( #23959 )
...
* refactor: Auto Repeat next schedule date function params
* refactor: Auto Repeat next schedule date function params
2020-12-22 12:32:36 +05:30
prssanna
ec959bc3b9
fix: override field_map for job card gantt
2020-12-22 12:32:36 +05:30
pateljannat
3a26f26671
fix: get_doc to avoid modified error
2020-12-22 11:56:59 +05:30
Shivam Mishra
7d3876d51a
feat: shopping cart search
2020-12-22 11:17:14 +05:30
Shivam Mishra
721251f09f
feat: add product category cards
2020-12-22 11:17:14 +05:30
Shivam Mishra
b4946c31b4
refactor: use h1 for slidetitle
2020-12-22 11:17:14 +05:30
Shivam Mishra
e40926b4cc
fix: don't use primary action for create
2020-12-22 11:17:14 +05:30
Shivam Mishra
09c8aaa87a
feat: add slider template
2020-12-22 11:17:14 +05:30
Shivam Mishra
fa102e4713
feat: add templates for online store
2020-12-22 11:17:14 +05:30
Anurag Mishra
0a1390a7ca
fix: leave policy dashboard fix and roles ( #24170 )
2020-12-22 11:16:36 +05:30
Ganga Manoj
090783804b
fix: Improve month_to_date computation
2020-12-21 23:52:05 +05:30
Ganga Manoj
c36cab81f2
fix: Update year_to_date and month_to_date field labels to show company currency
2020-12-21 23:46:02 +05:30
pateljannat
9466e42e70
fix: change request modifications
2020-12-21 20:52:20 +05:30
Nabin Hait
bd4bdca6ad
feat: Repost item costing ( #24183 )
...
* Repost item valuation (#24031 )
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
* fix: removed duplicate field from pos profile
2020-12-21 20:03:59 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation ( #24031 )
...
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
2020-12-21 14:45:50 +05:30
marination
eae31f02cc
fix: Sider (missing semi-colons)
2020-12-21 13:58:44 +05:30
Shivam Mishra
0e222173ea
fix: don't set primary action if workflow is set
2020-12-21 13:44:03 +05:30
marination
68f91c9640
chore: Added tests for new ux
...
- Test for value based inspection
- tweaks in test for formula based inspection
- tweaks in create_quality_inspection as status in child row is auto set now
2020-12-21 12:24:45 +05:30
marination
0c4f97368d
chore: UX improvement
...
- Removed 'single reading' checkbox, unnecessary
- Removed 'Mean' field and added computed mean to formula data
- Changed 'Value Based' to 'Non-Numeric'
- Re-arranged fields
2020-12-21 11:44:48 +05:30
Ganga Manoj
ddd9fe49fc
feat: Add month_to_date field
2020-12-18 23:58:05 +05:30
Ganga Manoj
59fbf702da
feat: Compute month_to_date
2020-12-18 23:52:11 +05:30
Ganga Manoj
1b1df6b6bc
feat: Add month_to_date field
2020-12-18 23:51:05 +05:30
marination
d6277cdc7f
feat: Value Based and Numeric Quality Inspection
...
- Acceptance Formula is optional
- Choose between Value based and Numeric QI
- If numeric, select single or multiple readings
- Added Min, Max and Mean Values for numeric inspection to avoid formula usage
- Deprecated code cleanup in js file
2020-12-18 21:37:19 +05:30
Ganga Manoj
89a02d7d3f
feat: Changed Fiscal Year to Payroll Period
2020-12-18 15:31:45 +05:30
Rushabh Mehta
2cd41bca06
fix(routes): desk to app
2020-12-18 13:17:58 +05:30
Afshan
a81519f557
fix: error popup for submitted doc
2020-12-18 11:16:01 +05:30
Ganga Manoj
9f1e018e4f
feat: Compute year_to_date
2020-12-18 01:35:27 +05:30
Ganga Manoj
04f48a011d
feat: Add year_to_date field
2020-12-18 01:31:00 +05:30
pateljannat
b8e656512e
fix: test cleanup
2020-12-17 20:22:06 +05:30
Deepesh Garg
e77e3aa36d
fix: Typo in tax category doctype query
2020-12-17 18:49:58 +05:30
Deepesh Garg
b074334dcf
fix: Typo in tax category doctype query
2020-12-17 18:46:59 +05:30
pateljannat
79b71462cb
fix: patch
2020-12-17 18:21:34 +05:30
Deepesh Garg
5a06908bbc
fix: Add breadccrumbs to item group page
2020-12-17 17:38:53 +05:30
pateljannat
09f0e9111d
fix: patch
2020-12-17 17:20:21 +05:30
Anurag Mishra
611b42733b
fix: leave policy dashboard fix and roles
2020-12-17 16:34:15 +05:30
Anurag Mishra
5e8e0037d6
Merge branch 'develop' into do-not-manufacture-same-serial-no-two-develop
2020-12-17 16:01:42 +05:30
Anurag Mishra
7e641f457c
Merge pull request #24166 from scmmishra/appointment-fix
...
fix: wrap assignees in a list
2020-12-17 16:00:48 +05:30
pateljannat
2dbb1d6bc7
fix: indentation
2020-12-17 15:49:52 +05:30
Shivam Mishra
1872e2c1ac
fix: wrap assignees in a list
2020-12-17 14:29:52 +05:30
Deepesh Garg
5432ee3364
Merge pull request #24095 from frappe/skr04_equity_dev
...
feat: separate equity tree in CoA SKR04
2020-12-17 12:37:28 +05:30
Deepesh Garg
51892efd60
fix: Translation issues
2020-12-17 12:35:22 +05:30
Deepesh Garg
f48296ddf0
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-17 12:20:16 +05:30
Deepesh Garg
6f99c0850c
fix: Linting Issues
2020-12-17 12:19:58 +05:30
pateljannat
2f4c88b228
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-17 11:56:06 +05:30
pateljannat
f2bff8e220
fix: patch relaod doctype
2020-12-17 11:54:59 +05:30
Deepesh Garg
d6cd02d29d
fix: Add tests
2020-12-17 09:21:24 +05:30
Deepesh Garg
5a2030c2f2
fix: Add server side methods and other fixes
2020-12-17 09:21:11 +05:30
Rucha Mahabal
f1854f9196
Merge branch 'develop' into fix-therapy-type-filter
2020-12-17 08:46:39 +05:30
Rohit Waghchaure
c9f63accdd
fix: do not manufacture same serial no multiple times
2020-12-17 00:18:17 +05:30
Deepesh Garg
a9db5a200f
Merge pull request #24160 from deepeshgarg007/tax_template_update_customer_v13
...
fix: Tax template update on customer address change
2020-12-16 21:51:01 +05:30
Suraj Shetty
70cfc4df15
fix: Remove dashboard page from home
2020-12-16 20:55:47 +05:30
Deepesh Garg
ad59726f20
fix: Tax template update on customer address change
2020-12-16 20:51:59 +05:30
Jannat Patel
28098d6f93
Merge branch 'develop' into project-template-and-tasks
2020-12-16 20:09:27 +05:30
Rucha Mahabal
21168eab7f
fix: Remove patch for setting next date in Subscription ( #24158 )
2020-12-16 19:39:34 +05:30
pateljannat
2528d5ee15
fix: tests
2020-12-16 18:29:49 +05:30
Rucha Mahabal
23d6afe43a
fix: Auto Repeat Import ( #24157 )
2020-12-16 18:21:08 +05:30
Prssanna Desai
230bc1f2d8
Merge pull request #24155 from prssanna/job-card-gantt-version-13
...
fix: override field_map for job card gantt
2020-12-16 17:02:34 +05:30
prssanna
6273d3ada6
fix: override field_map for job card gantt
2020-12-16 17:01:20 +05:30
Prssanna Desai
421bfee874
Merge branch 'develop' into job-card-gantt-v13
2020-12-16 16:59:50 +05:30
prssanna
ff59f18012
fix: override field_map for job card gantt
2020-12-16 16:56:30 +05:30
pateljannat
d44f45c57b
fix: sider issues
2020-12-16 16:28:09 +05:30
hasnain2808@gmail.com
2da0035a0f
Merge branch 'develop' into fix-analytics-reports
2020-12-16 16:14:23 +05:30
Rucha Mahabal
f2a431d866
fix: filter Therapy Types and Therapy Plan in Patient Appointment
2020-12-16 16:09:58 +05:30
Rucha Mahabal
5a8a52b9c6
fix: Therapy Type and Therapy Plan field visibility in Patient Appointment
2020-12-16 15:54:06 +05:30
Deepesh Garg
924f99bead
fix: Help message
2020-12-16 15:42:50 +05:30
Deepesh Garg
4638f604ed
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-16 14:59:30 +05:30
Rucha Mahabal
b184d43e75
refactor: Auto Repeat next schedule date function params ( #23959 )
...
* refactor: Auto Repeat next schedule date function params
* refactor: Auto Repeat next schedule date function params
2020-12-16 14:51:42 +05:30
hasnain2808@gmail.com
9962ba86d0
fix: charts not displaying when tree_type changed
2020-12-16 14:41:04 +05:30
Your Name
3ebe511eb9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-16 08:19:47 +00:00
pateljannat
87b477a311
feat: patch for project template tasks
2020-12-16 13:37:21 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Deepesh Garg
bc462fa140
Merge pull request #24146 from deepeshgarg007/tax_template_update_customer
...
fix: Tax template update on customer address change
2020-12-16 13:02:00 +05:30
Deepesh Garg
96a5e4effa
fix: Tax template update on customer address change
2020-12-16 13:00:55 +05:30
Rucha Mahabal
02ebc9a11e
Merge branch 'develop' into patient-history-enhancements
2020-12-16 12:51:45 +05:30
Rushabh Mehta
34fc528500
fix(minor): debounce taxes call
2020-12-16 09:44:11 +05:30
Leela vadlamudi
29778e2fba
feat: Voice Call Settings doctype added ( #24126 )
2020-12-15 21:23:17 +05:30
Mohammad Hasnain Mohsin Rajan
c553453825
fix: user is not a field ( #24129 )
2020-12-15 16:29:10 +05:30
Saqib Ansari
d050816e17
fix: overflow of customer selector
2020-12-15 12:02:26 +05:30
pateljannat
a6fef7ae6b
feat: parent-child relation tasks
2020-12-15 11:50:18 +05:30
pateljannat
caf67e608f
fix: tests
2020-12-15 10:00:31 +05:30
pateljannat
23f0debf88
fix: tests
2020-12-15 10:00:21 +05:30
Rucha Mahabal
85213fa8cb
fix(Asset): set current asset value before calculating difference amount ( #24119 )
2020-12-15 09:32:02 +05:30
Afshan
89d14fdf68
fix: minor ui changes ( #24125 )
...
* fix: minor ui changes
* fix: slider
2020-12-15 09:31:30 +05:30
Afshan
58e8e06ab7
fix: retention filters ( #24123 )
...
* fix: retention filters
* fix: slider
2020-12-15 09:17:17 +05:30
Afshan
e64718b2ae
fix: selecting salary component ( #24121 )
2020-12-15 09:16:27 +05:30
Nabin Hait
13dc63499a
Merge branch 'develop' into version-13-beta-pre-release
2020-12-15 09:06:27 +05:30
Deepesh Garg
46f3c65b00
feat: Multi currency in landed cost voucher
2020-12-14 23:09:19 +05:30
pateljannat
f9751f1f95
feat: project template having dependent tasks
2020-12-14 16:20:02 +05:30
Marica
406af27b9e
Merge branch 'develop' into putaway
2020-12-14 13:07:50 +05:30
Anurag Mishra
0fc4bb02d1
Merge pull request #24100 from hasnain2808/add-fb-to-je
...
fix(asset_val_adj): finance book not getting added in journal Entry of asset value adjustment
2020-12-14 12:36:03 +05:30
marination
c47d38dc18
chore: Stock Entry Tests and fixes
...
- Maintain item-warehouse wise rules for Stock Entry Material Transfer
- Test cases for Stock Entry with more use cases
- Sider fixes
2020-12-14 12:12:49 +05:30
Deepesh Garg
05e8479521
Merge pull request #24117 from deepeshgarg007/gstr_opening_invoices
...
fix: Opening invoices in GSTR-1 report
2020-12-14 11:14:23 +05:30
Mohammad Hasnain Mohsin Rajan
b59d573009
Merge branch 'develop' into add-fb-to-je
2020-12-14 11:13:46 +05:30
Deepesh Garg
c838682188
fix: Opening invoices in GSTR-1 report
2020-12-14 10:35:16 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
rohitwaghchaure
cf5f895617
Merge pull request #24110 from marination/status-updater-same-source-target-tables
...
fix: Same source and target tables in Status Updater's update query
2020-12-13 21:29:19 +05:30
rohitwaghchaure
d06ac9a958
Merge pull request #24114 from rohitwaghchaure/shipping-charges-not-added-in-invoice-develop
...
fix: shipping chanrges not sync in erpnext from shopify
2020-12-13 13:31:39 +05:30
rohitwaghchaure
8b8ef8d364
Merge pull request #24116 from rohitwaghchaure/fixed-stock-entry-multi-consumption-develop
...
fix: incorrect stock quantity if 'Allow Multiple Material Consumption…
2020-12-13 13:31:25 +05:30
rohitwaghchaure
e5e6d8297b
Merge pull request #24115 from rohitwaghchaure/delete-receive-at-warehouse-entry-develop
...
fix: delete Receive at Warehouse entry on cancellation of Send to War…
2020-12-13 12:33:50 +05:30
Nabin Hait
3423d94145
fix: Fixed merge conflict
2020-12-12 21:12:56 +05:30
Deepesh Garg
ced3b13492
fix: Check for paid field
2020-12-12 19:31:05 +05:30
Deepesh Garg
68fce6d029
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-12-12 19:28:50 +05:30
Rohit Waghchaure
edb99d4e53
fix: incorrect stock quantity if 'Allow Multiple Material Consumption' has enabled
2020-12-12 16:03:07 +05:30
Rohit Waghchaure
5bfd6831c4
fix: delete Receive at Warehouse entry on cancellation of Send to Warehouse entry
2020-12-12 16:00:28 +05:30
Rohit Waghchaure
67dfe5db0d
fix: shipping chanrges not sync in erpnext from shopify
2020-12-12 15:59:17 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
Rohit Waghchaure
3eea3c6c95
fix: Table 'tabStock Entry Detail' is specified twice
2020-12-11 18:45:39 +05:30
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch ( #24109 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-12-11 13:28:23 +05:30
Suraj Shetty
ada5facdf5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:49 +05:30
Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Jannat Patel
79fe7758d4
Merge branch 'develop' into partially-submit-drop-ship-items-issue
2020-12-11 11:57:09 +05:30
pateljannat
06961a261e
fix: conflicts
2020-12-11 11:46:43 +05:30
pateljannat
fa72671929
fix: partial order for drop ship
2020-12-11 11:16:54 +05:30
Mohammad Hasnain Mohsin Rajan
f60e303ac7
Merge branch 'develop' into add-fb-to-je
2020-12-11 09:35:36 +05:30
Suraj Shetty
c9209237da
fix: Progress bar style
2020-12-10 22:45:27 +05:30
pateljannat
6574404536
Merge branch 'project-template-and-tasks' of https://github.com/pateljannat/erpnext into project-template-and-tasks
2020-12-10 20:55:40 +05:30
pateljannat
e15ef1e19f
fix: corrected tests
2020-12-10 20:55:25 +05:30
Marica
d857d70a96
Merge branch 'develop' into stock-entry-for-medication-entries
2020-12-10 20:44:10 +05:30
Marica
3bc69e59ec
Merge branch 'develop' into update-barcode-if-scan-barcode-used
2020-12-10 18:05:00 +05:30
Mohammad Hasnain Mohsin Rajan
8abe7b91fe
fix: linting
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-12-10 17:48:22 +05:30
Mohammad Hasnain Mohsin Rajan
ce1ca28296
fix: linting
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-12-10 17:48:05 +05:30
Anurag Mishra
fcf0a733ac
Merge branch 'develop' into add-fb-to-je
2020-12-10 17:30:38 +05:30
Saqib
7acb42d6df
feat(POS): hide images & auto add item checkbox ( #24102 )
2020-12-10 16:22:01 +05:30
Deepesh Garg
009721a3b2
Merge pull request #24035 from nextchamp-saqib/abs-value-in-pf
...
fix: get formatted value in 'taxes' print template
2020-12-10 15:33:41 +05:30
Raffael Meyer
7f387452ca
Merge branch 'develop' into skr04_equity_dev
2020-12-10 10:51:55 +01:00
Mohammad Hasnain
f82997e3c3
fix(asset_val_adj): fb not getting added in je
2020-12-10 13:34:01 +05:30
Rushabh Mehta
39154e5296
fix(minor): add debounce to calls
2020-12-10 12:37:16 +05:30
Saqib
dc3e9f4216
fix: asset with value zero doesn't show up in fixed asset register ( #24091 )
2020-12-10 12:30:15 +05:30
barredterra
52d37edf98
feat: separate equity tree in CoA SKR04
2020-12-09 17:57:29 +01:00
Deepesh Garg
6e58260d26
Merge pull request #24082 from ruchamahabal/fix-item-details-in-reports
...
feat(reports): get item details from Item document instead of the Transactions
2020-12-09 18:28:28 +05:30
Deepesh Garg
249595a2d8
fix: Sider Issues
2020-12-09 18:13:23 +05:30
Jannat Patel
ad705d04a7
Merge branch 'develop' into project-template-and-tasks
2020-12-09 18:12:25 +05:30
Marica
4efbee57f3
Merge branch 'develop' into cont-temp
2020-12-09 17:33:26 +05:30
pateljannat
f936e8a334
fix: sider issues fixed
2020-12-09 17:09:22 +05:30
marination
a5d8d32775
chore: Test and fixes
...
- Tests as per new design flow
- Fixed duplicate data bug in Warehouse Capacity Summary
- Set Amount currently on applying rule in client side
- Apply rules on server side before validate
2020-12-09 16:27:18 +05:30
Deepesh Garg
c41fb7556b
fix: Add test case for batch pricing
2020-12-09 15:55:39 +05:30
pateljannat
811629a961
feat: tasks in project template and tests
2020-12-09 15:52:05 +05:30
Deepesh Garg
bc0a2859e4
fix: Rate for items with no batch
2020-12-09 12:40:09 +05:30
Mohammad Hasnain Mohsin Rajan
deaf2e80cb
fix: linting
2020-12-09 12:36:14 +05:30
Mohammad Hasnain
69514c4761
fix: scan barcode does not update barcode item field in sales order
2020-12-09 12:10:28 +05:30
Deepesh Garg
91e1136d2c
feat: Batch wise item pricing
2020-12-08 22:53:03 +05:30
marination
0f3cfc502b
feat: Trigger rule application from client side
...
- Table is reset and overwritten with applied rules on checkbox trigger
- Sider fixes
2020-12-08 19:44:29 +05:30
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
rohitwaghchaure
08d57e3530
Merge pull request #24074 from hasnain2808/required-qty-multiplying-fix
...
fix(Production Planning Report): incorrect required_qty
2020-12-08 12:52:12 +05:30
Rucha Mahabal
fa950662b9
fix: import statement
2020-12-08 12:32:19 +05:30
Rucha Mahabal
db0bbfac97
feat(reports): get item details from Item doctype instead of the Transaction
2020-12-08 12:20:07 +05:30
Marica
0b68243979
Merge branch 'develop' into putaway
2020-12-08 11:44:00 +05:30
Mohammad Hasnain
59dffb96b3
fix(Production Planning): incorrect required qty
2020-12-08 11:13:00 +05:30
pateljannat
c82b52855c
fix: template filter for tasks
2020-12-08 11:07:59 +05:30
Afshan
727b2f9b97
fix: throw an error when no pos profile exist ( #24025 )
...
* fix: throw an error when no pos profile exist
* fix: throw an error when no pos profile exist
* fix: test cases
* fix: tests
* fix: test
* fix: space as indent
* fix: travis
2020-12-08 09:45:19 +05:30
Walstan Baptista
0baebbdafe
fix: added Purchase Order to Global Search ( #24055 )
2020-12-08 09:43:29 +05:30
Anuja Pawar
d369710c65
fix: fixed home desk page ( #24075 )
...
* fix: fixed home desk page
* fix: suggested changes
Co-authored-by: Marica <maricadsouza221197@gmail.com>
* fix: suggested changes
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-12-08 09:40:08 +05:30
Jannat Patel
797f0cfa61
fix: sales invoice add button from sales order dashboard ( #24077 )
...
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-12-08 09:33:13 +05:30
Afshan
749d36a4dd
fix: double exception in payroll ( #24078 )
2020-12-08 09:32:04 +05:30
Afshan
01eca12fa7
fix: overriding po ( #24022 )
...
* fix: overriding po
* fix: po
* fix: refactor condition
* fix: condition
* fix: missing code
2020-12-08 09:27:56 +05:30
marination
fac4035f23
feat: Apply Putaway Rules within transaction itself
...
- Added checkbox 'Apply Putaway Rule' in PR and SE
- Added link to rule in child tables
- Rule is applied on Save
- Validation for over receipt
- Apply Rule on Stock Entry as well for Material Transfer and Receipt
2020-12-07 21:35:49 +05:30
pateljannat
71b1a0ca7d
fix: cancelling both test po created
2020-12-07 19:09:29 +05:30
pateljannat
32e77d73cf
fix: added supplier to second item in test
2020-12-07 17:39:37 +05:30
pateljannat
89624ad622
fix: sider issue fixed
2020-12-07 16:50:03 +05:30
pateljannat
5597e386b4
fix: added test for drop ship partial order
2020-12-07 15:53:45 +05:30
pateljannat
c32ac223ed
feat: adding task field in project template
2020-12-07 14:53:15 +05:30
Marica
654a71e35a
Merge pull request #24065 from Anuja-pawar/company_fiscal_year_fix
...
fix: Added TDS Payable account number and an error message
2020-12-07 13:21:18 +05:30
Marica
724d03ec68
Merge branch 'develop' into fix-si-pos-return
2020-12-07 12:01:19 +05:30
Kenneth Sequeira
85af44b7ed
fix: client side UX fixes
2020-12-07 11:18:20 +05:30
Anuja P
550cb9c78f
fix: suggested changes
2020-12-07 11:11:00 +05:30
Kenneth Sequeira
00510e7f12
Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp
...
pull latest
2020-12-07 10:56:30 +05:30
Anuja P
47b4b7009d
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-07 10:55:44 +05:30
Kenneth Sequeira
5f95ba57a8
fix: py code clean up and doc help
2020-12-07 10:45:13 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics ( #24073 )
2020-12-07 10:41:05 +05:30
Marica
13dcd18ede
Merge branch 'develop' into cont-temp
2020-12-07 09:53:23 +05:30
Deepesh Garg
6c35767995
Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims
...
fix: Show tax amount in base currencies
2020-12-06 23:24:24 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
...
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Deepesh Garg
cfeca0dc87
fix: Show tax amount in base currencies
2020-12-06 18:28:30 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message
...
grammatical fix
2020-12-06 10:48:32 +05:30
Deepesh Garg
2d1cfae596
fix: fieldname
2020-12-05 22:44:45 +05:30
Deepesh Garg
ceefd66090
Merge pull request #24041 from saurabh6790/v13-patch-fixes-1
...
fix: reload doctype number card link
2020-12-05 22:43:46 +05:30
Anuja P
b6cf75d2a8
fix: error messsage indent fix
2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-05 22:21:03 +05:30
Marica
3b2da41f84
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-12-05 17:04:26 +05:30
Anuja P
2e4faf96f2
fix: Added TDS Payable account number and an error message
2020-12-05 13:36:43 +05:30
Deepesh Garg
eb951f3996
Merge pull request #24060 from deepeshgarg007/template_update
...
fix(India): Tax template update on supplier change
2020-12-05 12:38:10 +05:30
Marica
067f35df26
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-12-04 21:13:23 +05:30
marination
c866abca56
fix: (travis) Disable update stock for deferred accounting item's Sales Invoice
2020-12-04 20:12:52 +05:30
Anurag Mishra
26b3328af7
fix: leave policy assignment patch ( #24061 )
2020-12-04 19:50:24 +05:30
pateljannat
7fef622b13
fix: drop ship partial order fixed
2020-12-04 19:18:36 +05:30
Deepesh Garg
a767085276
fix: Tax template update on supplier
2020-12-04 18:07:46 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr
2020-12-04 16:30:40 +05:30
Anuja Pawar
8a8a91c6b9
Merge branch 'develop' into issue_customer_filter
2020-12-04 15:26:40 +05:30
Anuja P
2e48cf7308
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
...
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
2020-12-04 15:19:06 +05:30
Kenneth Sequeira
c4eb41c92b
fix; styling for sider
2020-12-04 15:00:22 +05:30
Anuja P
931f2e73a7
fix: sider changes
2020-12-04 14:57:23 +05:30
Anuja Pawar
84166a931e
Merge branch 'develop' into issue_customer_filter
2020-12-04 13:33:18 +05:30
marination
6a2431586e
fix: Make new Customers for account missing test and set company
2020-12-04 13:31:36 +05:30
Rucha Mahabal
edee530d4c
fix: paid amount in Sales Invoice POS return resets to 0
2020-12-04 12:13:26 +05:30
Rohit Waghchaure
28e86cf183
fix: pricing rule with transaction not working for additional product
2020-12-04 11:57:56 +05:30
Deepesh Garg
7b2d518059
fix: Dimension filters in accounting reports
2020-12-04 11:28:26 +05:30
Anuja P
0139109de2
fix: consistency check
2020-12-04 11:28:13 +05:30
Glen Whitney
dea6a90a1f
feat(Accounting Dimension): other apps may have accounting dimension doctypes
...
Prior to this change, there was simply a single hardcoded list of doctypes
with accounting dimensions in ERPNext. However, when extending the
capabilities of ERPNext using an add-on app rather than by modifying
ERPNext itself, it may well be necessary to create new doctypes in other
apps that will have accounting dimensions as well.
So, this PR moves the list of doctypes with accounting dimensions into
hooks.py so it can be accumulated from multiple apps. It also allows the
list of doctypes in make_dimension_in_accounting_doctypes be specifiable,
for more convenient use in the after_install hooks of other apps.
2020-12-03 22:27:44 +00:00
Marica
4bf951a85b
Merge branch 'develop' into v13-patch-fixes-1
2020-12-03 19:55:03 +05:30
Saqib Ansari
f4d645f87a
perf: async pos app start
2020-12-03 19:30:12 +05:30
Saqib Ansari
a6a37b7c81
fix: scroll elements
2020-12-03 19:24:07 +05:30
Anuja P
25e058833a
fix: sider changes
2020-12-03 18:13:24 +05:30
Anuja P
26cc662a78
feat: added filter for customer field
2020-12-03 17:45:34 +05:30
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Rohit Waghchaure
8474476316
fix: incorrect balance value in stock balance report
2020-12-03 13:43:11 +05:30
Kenneth Sequeira
131e46bab7
chore: add help section for Jinja
2020-12-02 21:37:55 +05:30
Kenneth Sequeira
9abc685504
feat: add jinja templating in contract template
2020-12-02 21:13:50 +05:30
Joshua Angelo Bienes
324622bd2a
Merge branch 'develop' into shipment_with_integration
2020-12-02 19:21:32 +08:00
marination
523c464a92
fix: Test Payment Based on Leave Application (Travis)
2020-12-02 16:01:35 +05:30
jbienesdev
8e68f128c1
fix: travis build error
...
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
2020-12-02 08:56:49 +00:00
Deepesh Garg
12b45b3f2a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-02 12:46:23 +05:30
jbienesdev
b4b542d1c3
chore: linter issues and sider checks
2020-12-02 07:15:16 +00:00
jbienesdev
99361b4a9e
chore: remove notification details section
2020-12-02 07:15:14 +00:00
jbienesdev
28055f483d
fix(shipment): change shipment test and refactor shipment.js
2020-12-02 07:15:13 +00:00
jbienesdev
ac3c1f1493
chore: remove packlink, letmeship, and sendcloud files
2020-12-02 07:15:11 +00:00
jbienesdev
000494f548
fix(shipment): apply code review
2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8
feat(shipment): Shipment Doctype with Integrations
2020-12-02 07:14:58 +00:00
Deepesh Garg
59820004b8
fix: Exception naming
2020-12-02 12:34:59 +05:30
Deepesh Garg
ab5053ef9c
fix: Accounting dimension import in PCV
2020-12-02 12:34:40 +05:30
Deepesh Garg
d8aeaed6ab
Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue
...
fix: GSTR B2C report
2020-12-01 20:44:33 +05:30
Saurabh
2e27f074c3
feat: reload doctype number card link
2020-12-01 18:08:04 +05:30
Rohit Waghchaure
1ac040a418
fix: GSTR report
2020-12-01 13:50:01 +05:30
Rucha Mahabal
288853d8f0
Merge branch 'develop' into patient-history-enhancements
2020-12-01 13:44:16 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Anurag Mishra
0e9eb95b22
Merge branch 'develop' into bom-fix
2020-12-01 13:18:00 +05:30
Leela vadlamudi
a3845a95ed
feat: Introducing telephony module ( #24032 )
2020-12-01 13:04:53 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Nabin Hait
029b9c08dd
Update bom.py
2020-12-01 09:33:17 +05:30
Suraj Shetty
ad57eef40c
fix(product-listing): Check if customer exists ( #24030 )
...
- It might happen that perty_name might not always be Customer
(it might be Supplier as well)
2020-12-01 09:14:57 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Saqib Ansari
188e0ecbcb
fix: submit order summary center alignment
2020-11-30 17:53:57 +05:30
Anurag Mishra
66e8a12d0f
fix: KeyError 'sourced_by_supplier'
2020-11-30 17:53:28 +05:30
Rucha Mahabal
f6756838ba
fix: patch
2020-11-30 17:51:56 +05:30
Saqib Ansari
02d1491e39
fix: order summary qty alignment
2020-11-30 17:42:51 +05:30
Rucha Mahabal
b5b8c5474a
refactor: move call to fetch doctype fields to server-side
2020-11-30 16:09:15 +05:30
Saqib Ansari
19d5074c25
fix: get formatted value in 'taxes' print template
2020-11-30 15:49:00 +05:30
Rucha Mahabal
0d43ea5ebb
refactor: show Patient History feed as per configured date instead of creation
2020-11-30 15:00:42 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
3e6cdea51f
feat: delete config python files
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
rohitwaghchaure
9707b4789e
fix: stock ageing report not working ( #23923 )
2020-11-30 14:58:00 +05:30
Afshan
7e2d8ca916
fix: Handle the "no leave_allocation found" case ( #23922 )
...
* fix: Handle the "no leave_allocation found" case
* fix: format of error msg
2020-11-30 14:58:00 +05:30
Marica
1466ed4579
fix: Don't copy terms and discount from SO to PO ( #23903 )
...
* fix: Dont copy terms, discount and required by from SO to PO
* fix: Let delivery date and required by date get mapped
2020-11-30 14:58:00 +05:30
Suraj Shetty
c8b5f982ac
fix: Typo (Enchashment > Encashment) ( #23919 )
2020-11-30 14:58:00 +05:30
Afshan
8c3b2d0a0d
fix: change query to frappe.get_all
2020-11-30 14:58:00 +05:30
Afshan
beb1811523
fix: payroll attendance error
2020-11-30 14:58:00 +05:30
marination
d0ee615c2c
chore: Pricing Rule with Item Price Test
2020-11-30 14:58:00 +05:30
marination
8e2ce641c3
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-30 14:58:00 +05:30
Anurag Mishra
58a3fea1b7
fix: Error handling in Upload Attendance ( #23907 )
2020-11-30 14:58:00 +05:30
Raffael Meyer
896e4b1722
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-30 14:58:00 +05:30
Kenneth Sequeira
39102e68df
fix: make contract template editable ( #23891 )
2020-11-30 14:58:00 +05:30
rohitwaghchaure
10c168e257
fix: default cost center in item master not set in stock entry ( #23877 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-30 14:58:00 +05:30
Raffael Meyer
59be7ff144
feat: make account number length configurable ( #23845 )
2020-11-30 14:58:00 +05:30
Raffael Meyer
1ea12079da
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-30 14:58:00 +05:30
Marica
ecce3bca2f
chore: PO cleanup ( #23774 )
...
* chore: Subcontracting section and items section enhancement
- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section
* chore: PO & PO Item Form Cleanup
* chore: PO Get Items from cleanup
* fix: Taxes and Charges field visibility
* chore: Cleanup
* fix: Translation styling
2020-11-30 14:58:00 +05:30
Rohit Waghchaure
d6a2b390dc
fix: not able to save bom
2020-11-30 14:58:00 +05:30
Deepesh Garg
7b16c55c9a
feat: Sync old shopify orders ( #23841 )
...
* feat: Sync old shopify orders
* fix: Old orders syncing by date
* fix: Remove unnecessary code
* fix: Remove unintentional changes
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-11-30 14:58:00 +05:30
Anurag Mishra
a81e872cdb
fix: added wrong absent days calculation in salary slip
2020-11-30 14:57:27 +05:30
Rucha Mahabal
ed3fc20731
fix: sider issues
2020-11-30 14:56:24 +05:30
Rucha Mahabal
7a69a3367c
Merge branch 'develop' into patient-history-enhancements
2020-11-30 14:16:46 +05:30
Rucha Mahabal
4ee293d2f4
fix: handle non-configured fields
2020-11-30 14:12:48 +05:30
Rucha Mahabal
5e3c51bf7d
refactor: format value using standard formatters
2020-11-30 13:35:00 +05:30
Anurag Mishra
8b6c58d560
Merge pull request #24005 from Anurag810/leave_ledger_patch
...
fix: ignore exception during leave ledger creation from patch
2020-11-30 13:26:47 +05:30
Rucha Mahabal
c538a4a31d
refactor: remove medical record creation methods from individual doctypes
2020-11-30 13:22:34 +05:30
Rucha Mahabal
c0fcc807d3
feat: hooks for updating and deleting medical records
2020-11-30 13:22:01 +05:30
marination
724e16bca1
chore: Use JSON style response and use ORM
...
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
2020-11-30 12:55:30 +05:30
Rucha Mahabal
4097e89f8b
feat: Standard doctype config for Patient History
2020-11-30 12:48:39 +05:30
Rucha Mahabal
f3df5c9f3c
feat: patch to setup standard doctype config in Patient History Settings
2020-11-30 12:16:28 +05:30
Rucha Mahabal
06e7cc2c35
fix: Handle table field rendering in Patient Medical record
2020-11-30 12:01:48 +05:30
Deepesh Garg
8db507bfd9
Merge pull request #24027 from resilient-tech/fix-taxjar
...
fix: import taxjar globally in the taxjar_integration module
2020-11-30 11:23:32 +05:30
Deepesh Garg
6302de9290
Merge pull request #23975 from deepeshgarg007/jv_zero_value
...
fix: Validation for journal entry with 0 debit and credit values
2020-11-30 10:56:40 +05:30
Deepesh Garg
452cbcd6ea
fix: Update payments directly in Loan Interest Accrual
2020-11-30 10:55:12 +05:30
Rucha Mahabal
4d6d115a4d
feat: date range filter for Patient History
2020-11-29 23:16:12 +05:30
Deepesh Garg
681c0e297c
Merge branch 'develop' of https://github.com/frappe/erpnext into loan_patch_fix
2020-11-29 23:07:14 +05:30
Rucha Mahabal
4af3d4e4bb
fix: feed not visible when filter is reset
2020-11-29 22:43:56 +05:30
Rucha Mahabal
fc1e352adf
feat: Doctype filter for Patient History
2020-11-29 22:38:14 +05:30
Deepesh Garg
2d5530da96
fix: Invoice discounting test
2020-11-29 22:17:47 +05:30
Sagar Vora
38e4635a10
fix: import taxjar globally in the taxjar_integration module
2020-11-29 20:26:26 +05:30
Rucha Mahabal
cbdbb9e65d
chore: code clean-up
2020-11-28 23:58:00 +05:30
Rucha Mahabal
a75f79762f
feat: Link for individual documents in Patient History
2020-11-28 23:09:07 +05:30
Rucha Mahabal
c91e03c891
feat: Create Patient Medical Record on configured doctype submission
2020-11-28 20:24:06 +05:30
Rucha Mahabal
f2932d7208
feat: set date field in Settings for Patient Medical Record
2020-11-28 19:19:58 +05:30
Rucha Mahabal
2c114053ad
feat: Patient History Settings
2020-11-27 15:05:28 +05:30
Rucha Mahabal
cf012ca9c3
fix: show stock entry button only if update stock is enabled
2020-11-27 12:39:33 +05:30
Rucha Mahabal
f5eddce407
test: Inpatient Medication Entry Drug Shortage
2020-11-27 12:27:17 +05:30
Rucha Mahabal
ac8ee249d5
feat: Medication doctypes added to Desk page and Patient dashboard
2020-11-26 22:11:20 +05:30
Rucha Mahabal
54228691e7
feat(IPME): Button to create Stock Entry for Drug Shortage
2020-11-26 16:38:28 +05:30
marination
1087d97c03
feat: Warehouse Capacity Summary
...
- Added Page Warehouse Capacity Summary
- Added Page to Desk and Putaway List View
- Reused Item Dashboard/Stock Balance page render code
- Added naming series to Putaway Rule
2020-11-26 10:45:44 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return
2020-11-25 17:24:03 +05:30
Anurag Mishra
755b773616
feat: Leave policy assignment ( #23112 )
...
* feat: Leave Policy Assignment
* feat: linking with leave allocation and valiations
* style: removed old code from leave period
* feat: Bulk Leave policy Assignment and grant Leaves
* fix: overlap validation
* feat: earned leaves based on joining date
* feat: automatic grant leave based on leave policy
* patch: create leave policy assignment based on employee current leave policy
* fix: dependent test cases
* test: Leave policy assignment
* fix: some enhancement
* style: break large function into small function
* fix:requested Changes
* fix(patch): Handled old Leave allocatioln
* fix:codacy
* fix: travis and sider,codacy
* fix: codacy
* fix: codacy
* fix: requested changes and sider
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-25 16:05:17 +05:30
Anurag Mishra
f32cff1080
feat : Leave type with partial payment ( #23173 )
...
* feat: Partially paid Leaves
* feat: some importatnt validation
* fix: requested changes
* fix: requested changes
* fix: travis, sider, codacy
* fix: changes requested
* test: Partially Paid Leaves
2020-11-25 16:00:15 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings ( #24004 )
...
* fix: translation strings
* fix: linting
2020-11-25 15:37:54 +05:30
Prssanna Desai
e60a62bde5
fix: function imports in account_balance_timeline.py ( #24003 )
2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates ( #23998 )
...
* feat: add company filter to tax templates
* fix: remove filer from PO because it is from tran
* fix: linting
* fix: solve translation string issues
* fix: remove doctype name
2020-11-25 15:36:41 +05:30
Anurag Mishra
7824e81298
fix: ignore exception during leave ledger creation from patch
2020-11-25 14:54:50 +05:30
Deepesh Garg
1a4390de44
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e
fix: Move filter setup to doctype controllers
2020-11-25 14:49:10 +05:30
Deepesh Garg
92b3449789
fix: Label changes
2020-11-25 14:01:57 +05:30
Deepesh Garg
4e991fe668
fix: Define specific exceptions and fix tests
2020-11-25 13:46:07 +05:30
Deepesh Garg
df065f7044
fix: form layout and naming fixes
2020-11-25 13:44:52 +05:30
Deepesh Garg
6c17b84cae
fix: Replace raw query with ORM
2020-11-25 13:42:16 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return
2020-11-25 10:43:55 +05:30
Rucha Mahabal
6b57cf3285
feat: Quality Inspection on Job Card ( #23964 )
...
* feat: Quality Inspection on Job Card
* fix(Job Card): quality inspection filter query
* fix: sider issues
2020-11-25 09:17:16 +05:30
Nabin Hait
0508e6bdfa
fix: Added link of bank reconciliation and clearance in accounting desk page ( #23809 )
2020-11-25 09:16:12 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings ( #23783 )
...
* fix: start_pattern
* fix: translatable strings
* fix: add missing semicolon (task)
* fix: add missing semicolon (setup_wizard)
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: move out HTML element as variable
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: pull out message, translate "Undo".
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: typo
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* Revert "fix: start_pattern"
This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-25 09:11:51 +05:30
Rucha Mahabal
c66bd45ba4
feat: Inpatient Medication Orders Script Report ( #23984 )
...
* feat: Inpatient Medication Orders Script Report
* feat: add chart for Inpatient Medication Order Report
* feat: add report to Desk Page
* feat: added filters for dates and healthcare service unit
* test: Inpatient Medication Orders report
2020-11-25 09:09:40 +05:30
Deepesh Garg
a339752ba4
fix: Loan disbursement amount validation ( #24000 )
2020-11-25 08:54:51 +05:30
Mohammad Hasnain Mohsin Rajan
e4755828c4
fix: template errors in pricing rule ( #23999 )
...
* fix: solve microtemplating errors
2020-11-24 23:31:06 +05:30
rohitwaghchaure
f38abdeac0
Merge pull request #23994 from rohitwaghchaure/bom-stock-project-item-color-develop
...
fix: bom stock report color showing always red
2020-11-24 21:16:51 +05:30
marination
2ed80656aa
chore: Code Cleanup
...
- Validate capacity < stock level only on new rule
- Mention stock uom while validating capacity in new rule
- Separate function to format and display unassigned items
- Format ORM args
2020-11-24 21:07:56 +05:30
marination
2fbaa5dc58
Merge branch 'putaway' of https://github.com/marination/erpnext into putaway
2020-11-24 17:39:19 +05:30
marination
68a49efc80
chore: Added Putaway Rule to Desk Page and added Priority to List View
2020-11-24 17:38:34 +05:30
Marica
e762bc67eb
Merge branch 'develop' into putaway
2020-11-24 17:28:34 +05:30
rohitwaghchaure
5ab2e6c1ff
Merge pull request #23991 from pateljannat/job-card-operation-field-error
...
fix: job card error handling for operations field
2020-11-24 17:05:44 +05:30
Rohit Waghchaure
5a33f2c394
fix: bom stock report color showing always red
2020-11-24 16:59:36 +05:30
Saqib Ansari
ac164c66ed
perf: get recent transaction only when component is visible
2020-11-24 16:09:11 +05:30
Saqib Ansari
7f1d7894c2
fix: cannot find erpnext.payments
2020-11-24 16:08:38 +05:30
rohitwaghchaure
ccd554c19c
Merge pull request #23989 from Anurag810/item-maintain-stock-fixes
...
fix: maintain stock can't be changed it there is product bundle
2020-11-24 15:57:01 +05:30
pateljannat
b67ebc7636
fix: job card error handling for operations field
2020-11-24 15:37:30 +05:30
Deepesh Garg
d39ebf248e
Merge pull request #23990 from deepeshgarg007/shopify_order_id_sync
...
fix: Old shopify order syncing date
2020-11-24 15:12:53 +05:30
Deepesh Garg
43a830f3f5
fix: Old shopify order syncing date
2020-11-24 15:10:36 +05:30
Anurag Mishra
927106f552
fix: maintain stock can't be changed it there is product bundle
2020-11-24 15:02:52 +05:30
marination
ccbd432b56
chore: Added Tests
...
- Fixed Sider Issues
- Added perms to Putaway Rule
- Added Unit Tests to check warehouse assignment
2020-11-24 12:47:13 +05:30
Deepesh Garg
d07447aa5f
fix: Validation for duplicate Tax Category ( #23978 )
...
* fix: Validation for duplicate Tax Category
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-24 08:09:17 +05:30
Afshan
6aa6ec1832
fix: clear error message when approval not available ( #23971 )
2020-11-24 08:01:19 +05:30
marination
0cec1477f2
chore: Format unassigned Items dialog and add freeze message
2020-11-23 19:19:35 +05:30
Saqib Ansari
c1afc95e3c
chore: remove unused code
2020-11-23 18:40:06 +05:30
Saqib Ansari
96feae608d
refactor: build point of sale min js
2020-11-23 18:39:56 +05:30
Saqib Ansari
937dc467a0
fix: no transactions placeholder
2020-11-23 18:34:08 +05:30
Saqib Ansari
eeee7e9427
fix: post submission invoice recipt screen
2020-11-23 18:34:03 +05:30
Saqib Ansari
69ef766a93
feat: number pad in payment screen
2020-11-23 18:33:55 +05:30
Saqib Ansari
fa0ef218dd
fix: customer details spacing
2020-11-23 18:33:45 +05:30
Saqib Ansari
f719380a0d
fix: discount and taxes spacing
2020-11-23 18:33:40 +05:30
Saqib Ansari
fada84cc47
fix: remove console and asset loading
2020-11-23 18:33:34 +05:30
Saqib Ansari
d0d6fc2e17
fix: cannot open past order summary
2020-11-23 18:33:29 +05:30
Saqib Ansari
b0b6aa9124
refactor: past order list and summary with new ui
2020-11-23 18:33:22 +05:30
Saqib Ansari
7202e9f658
refactor: pos payment with new ui
2020-11-23 18:33:05 +05:30
Saqib Ansari
fc3315a6d7
feat: pos item details with new ui
2020-11-23 18:32:58 +05:30
Saqib Ansari
cc208839cf
feat: pos cart with new ui
2020-11-23 18:32:49 +05:30
Saqib Ansari
210baafad4
feat: pos customer selector new ui
2020-11-23 18:32:07 +05:30
Saqib Ansari
0fb2e02b56
feat: pos item selector new ui
2020-11-23 18:32:00 +05:30
marination
90598ea19c
chore: Multi UOM support for Putaway
...
- Added UOM & conversion factor field in Putaway Rule
- Items are split and assigned as per UOM
- Handled Whole UOMs too
2020-11-23 17:35:13 +05:30
rohitwaghchaure
b9b8a13393
Merge pull request #23980 from rohitwaghchaure/color-not-showing-in-bom-stock-report-develop
...
fix: bom stock report color issue
2020-11-23 16:43:32 +05:30
Rucha Mahabal
9a73a67dcd
Merge pull request #23982 from pateljannat/track-changes-in-stock-settings
...
fix: enabling track changes for stock settings
2020-11-23 15:57:48 +05:30
rohitwaghchaure
f9a44000d9
Update bom_stock_report.js
2020-11-23 15:40:06 +05:30
pateljannat
34f381df17
fix: enabling track changes for stock settings
2020-11-23 15:31:08 +05:30
Rohit Waghchaure
610d9ca649
fix: bom stock report color issue
2020-11-23 14:10:55 +05:30
marination
9596276b95
fix: Linter and Sider
2020-11-23 10:32:17 +05:30
Deepesh Garg
20d6143c38
fix: Validation for journal entry with 0 debit and credit values
2020-11-21 12:09:11 +05:30
Jannat Patel
34d07b6306
fix: purchase receipt to purchase invoice bill date mapping ( #23967 )
...
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-11-20 19:22:35 +05:30
Saurabh
ecc50c8c24
bumped to version 13.0.0-beta.6
2020-11-20 15:22:00 +05:50
rohitwaghchaure
6b53ef7cce
Merge pull request #23947 from rohitwaghchaure/incorrect-delink-serial-no-and-batch
...
fix: incorrect delink serial no and batch
2020-11-20 13:45:17 +05:30
Rohit Waghchaure
0b71801462
fix: incorrect delink serial no and batch
2020-11-20 12:59:00 +05:30
marination
c7991f8561
feat: Putaway Rule
2020-11-20 11:53:20 +05:30
Deepesh Garg
06e16eb748
Merge pull request #23941 from pateljannat/place-of-supply-change-issue
...
fix: place of supply change on address change
2020-11-20 11:13:19 +05:30
Rohit Waghchaure
ceab692f73
fix: incorrect delink serial no and batch
2020-11-20 00:25:03 +05:30
pateljannat
1d5d863e9a
fix: removing return_taxes condition
2020-11-19 20:11:45 +05:30
Smit Vora
8aeb340dc8
fix: add remarks to sales invoice
2020-11-19 19:18:48 +05:30
Rohit Waghchaure
f0b1670abc
fix: tds test case
2020-11-19 18:40:13 +05:30
Rohit Waghchaure
b6ef59f8e9
fix: incorrect delink serial no and batch
2020-11-19 16:15:32 +05:30
marination
86e03325c3
Merge branch 'develop' of https://github.com/frappe/erpnext into putaway
2020-11-19 14:07:48 +05:30
Jannat Patel
c1187bc1d5
fix: duplicate items validation for POS Invoice when allow multiple items is disabled ( #23896 )
...
* fix: duplicate items validation for POS when allow multiple items in disabled
* fix: variable name change for duplicate item validation
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
2020-11-19 13:10:24 +05:30
Nabin Hait
93bb7b0000
Merge branch 'develop' into membership-enhancements-2
2020-11-19 13:05:17 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return
2020-11-19 12:21:38 +05:30
pateljannat
cd05b34691
fix: company filter added again
2020-11-19 11:37:08 +05:30
Deepesh Garg
dd7a6d948c
Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop
...
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-11-19 11:27:38 +05:30
Deepesh Garg
ebdc8cee5b
Merge pull request #23825 from igormbq/fix-demo
...
fix: location data on Asset to use command(make_demo)
2020-11-19 11:26:12 +05:30
Nabin Hait
2afc0bd87b
Merge branch 'develop' into naming-series-proj
2020-11-19 08:24:32 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field ( #23776 )
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Marica
6dafe1eabf
feat: Formula based Quality Inspection ( #23916 )
...
* feat: Formula based Quality Inspection
* chore: Added Test for Formula Based QI reading
2020-11-19 08:12:58 +05:30
rohitwaghchaure
6e974bf246
Merge pull request #23949 from pateljannat/email-digest-user-not-found-issue
...
fix: email digest user not found
2020-11-18 23:54:34 +05:30
Smit Vora
bbe4933a52
fix(regional): set proper state code in ewaybill JSON when gst_category is SEZ
2020-11-18 21:00:09 +05:30
Shivam Mishra
1a74dd4237
feat: add product category cards
2020-11-18 17:56:37 +05:30
Shivam Mishra
ca3809831c
refactor: use h1 for slidetitle
2020-11-18 17:39:17 +05:30
pateljannat
188657d05a
fix: email digest user not found
2020-11-18 17:15:54 +05:30
Shivam Mishra
3bec3cfef1
fix: don't use primary action for create
2020-11-18 17:10:02 +05:30
Shivam Mishra
8cf3bdd044
feat: add slider template
2020-11-18 17:09:45 +05:30
rohitwaghchaure
67ba0462e9
Merge pull request #23408 from kevingdc/fix/item-price-duplicate-checking
...
fix: Item price duplicate checking
2020-11-18 16:41:48 +05:30
pateljannat
410db04b48
fix: linter issue for translation syntax
2020-11-18 15:57:16 +05:30
Deepesh Garg
a0b17c4ef6
Merge pull request #23836 from pateljannat/purchase-taxes-and-charges-account-name-issue
...
fix: correcting description field in taxes and charges for accounts with account number + account name
2020-11-18 15:31:25 +05:30
Deepesh Garg
81f6ef3e1a
Merge pull request #23934 from Anurag810/memebership-fixes
...
fix: validation for membership
2020-11-18 15:25:24 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format
...
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
pateljannat
d0c528143f
Merge branch 'place-of-supply-change-issue' of https://github.com/pateljannat/erpnext into place-of-supply-change-issue
2020-11-18 12:52:24 +05:30
pateljannat
8c9b60edfe
fix: reversing previous commits and adding condition in regional controller
2020-11-18 12:51:13 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items ( #23914 )
...
* fix: pos item search includes non stock items
* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Jannat Patel
96a0c17626
Merge branch 'develop' into place-of-supply-change-issue
2020-11-18 10:27:20 +05:30
Deepesh Garg
69232f8dd1
fix: Loan application link on creating loan
2020-11-17 22:00:41 +05:30
pateljannat
6b10d87d46
fix: place of supply change on address change
2020-11-17 20:34:51 +05:30
Anurag Mishra
3271437314
fix: Handle for custom field IFSC code in Bank remittance report. ( #23905 )
...
* fix: Handel for custom field IFSC code
* fix: changes_requested
2020-11-17 17:52:59 +05:30
Shivam Mishra
f9e4f6b57a
feat: add templates for online store
2020-11-17 16:38:09 +05:30
Anurag Mishra
a77f2ba0de
fix: validation for membership
2020-11-17 15:34:05 +05:30
Deepesh Garg
350972ece4
fix: Account filters
2020-11-17 13:51:58 +05:30
Deepesh Garg
8b4d92d4fc
fix: Disable filters after test
2020-11-17 13:19:29 +05:30
Shivam Mishra
e0b2e31f86
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-17 12:28:14 +05:30
rohitwaghchaure
7aa60d1dea
fix: stock ageing report not working ( #23923 )
2020-11-17 12:10:27 +05:30
Afshan
c72b693223
fix: Handle the "no leave_allocation found" case ( #23922 )
...
* fix: Handle the "no leave_allocation found" case
* fix: format of error msg
2020-11-17 12:08:31 +05:30
Marica
23614b650e
fix: Don't copy terms and discount from SO to PO ( #23903 )
...
* fix: Dont copy terms, discount and required by from SO to PO
* fix: Let delivery date and required by date get mapped
2020-11-17 11:12:31 +05:30
Deepesh Garg
6456c3dc24
fix: Linting and test cases
2020-11-17 11:10:00 +05:30
Suraj Shetty
5e8b00207b
fix: Typo (Enchashment > Encashment) ( #23919 )
2020-11-17 10:58:09 +05:30
pateljannat
642819b955
fix: place of supply change when address changes
2020-11-17 09:47:10 +05:30
Deepesh Garg
4bd52b4842
fix: Add test case
2020-11-16 23:01:36 +05:30
Deepesh Garg
d82c0f3bea
fix: Add disable and mandatory check for accounting dimension filters
2020-11-16 20:32:16 +05:30
Mohammad Hasnain
d2477e6cc5
fix(UAE VAT 201): remove branch parts
2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d
feat(UAE VAT 201): emirate according to branch
2020-11-16 17:36:27 +05:30
Anurag Mishra
d6e6c51f37
Merge branch 'develop' into salary_slip_fixes
2020-11-16 15:56:22 +05:30
Anurag Mishra
17d5ce3e41
fix: payroll attendance error ( #23887 )
...
* fix: payroll attendance error
* fix: change query to frappe.get_all
2020-11-16 14:20:18 +05:30
Marica
06f522cb27
Merge branch 'develop' into naming-series-proj
2020-11-16 13:32:24 +05:30
Deepesh Garg
0c6319194e
fix: GL Entry validation for dimensions
2020-11-16 13:20:19 +05:30
Mohammad Hasnain
b8d0b546a7
feat(UAE VAT Format): use company address for emir
2020-11-16 12:58:38 +05:30
marination
d51c953c22
chore: Fix Tests, use project name instead of project_name field
2020-11-16 12:48:40 +05:30
rohitwaghchaure
6094d66a6d
Merge pull request #23636 from marination/item-price-pricing-rule-conflict
...
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-16 12:22:30 +05:30
Deepesh Garg
9e9ea96582
fix: linting
2020-11-16 12:03:47 +05:30
Deepesh Garg
1f9b03345d
fix: Remove project filter
2020-11-16 09:55:35 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Deepesh Garg
6e5748e2a3
fix: dimension filter query
2020-11-15 22:43:48 +05:30
Deepesh Garg
96e874bfda
fix: dimension filter query
2020-11-15 22:43:01 +05:30
Deepesh Garg
8b6370bb45
feat: Add accounting dimension filter doctype
2020-11-15 22:41:36 +05:30
Anurag Mishra
69be37f88d
fix: Error handling in Upload Attendance ( #23907 )
2020-11-15 11:14:35 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Kenneth Sequeira
c5966d3d70
fix: make contract template editable ( #23891 )
2020-11-15 09:44:36 +05:30
rohitwaghchaure
1c8c1d78e9
fix: default cost center in item master not set in stock entry ( #23877 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-11-15 09:40:44 +05:30
Raffael Meyer
8ff0d0cff6
feat: make account number length configurable ( #23845 )
2020-11-15 09:34:05 +05:30
Raffael Meyer
4bf09dd02b
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-15 09:32:24 +05:30
Marica
188ecd7b39
chore: PO cleanup ( #23774 )
...
* chore: Subcontracting section and items section enhancement
- Set target warehouse moved to Items section
- Added subcontraction label to supply RM section
* chore: PO & PO Item Form Cleanup
* chore: PO Get Items from cleanup
* fix: Taxes and Charges field visibility
* chore: Cleanup
* fix: Translation styling
2020-11-15 09:17:42 +05:30
Rohit Waghchaure
30c704a4cb
fix: not able to save bom
2020-11-14 07:15:19 +05:30
rohitwaghchaure
a8eedb057b
Merge pull request #23910 from rohitwaghchaure/not-able-to-save-bom
...
fix: not able to save bom
2020-11-14 07:12:22 +05:30
Rohit Waghchaure
4abc5657ab
fix: not able to save bom
2020-11-13 22:18:48 +05:30
Deepesh Garg
a862eb25e6
fix: Make repayment entry only if amount exists
2020-11-13 17:57:57 +05:30
Afshan
3e7f7e3374
Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance
...
Merge branch 'fix-payroll-attendance' of https://github.com/AfshanKhan/erpnext into fix-payroll-attendance
2020-11-13 17:04:18 +05:30
Afshan
1a4cafb97d
fix: change query to frappe.get_all
2020-11-13 17:04:05 +05:30
Deepesh Garg
37dc369af9
feat: Sync old shopify orders ( #23841 )
...
* feat: Sync old shopify orders
* fix: Old orders syncing by date
* fix: Remove unnecessary code
* fix: Remove unintentional changes
Co-authored-by: Saurabh <saurabh@erpnext.com>
2020-11-13 16:53:35 +05:30
Marica
510b389838
Merge branch 'develop' into naming-series-proj
2020-11-13 13:37:19 +05:30
Afshan
5cffb6c72f
Merge branch 'develop' into fix-payroll-attendance
2020-11-13 13:01:51 +05:30
Deepesh Garg
78690af440
fix: Update only if loans to close
2020-11-12 18:47:34 +05:30
Deepesh Garg
c51b340ddf
fix: Update closed loans
2020-11-12 18:43:43 +05:30
Anurag Mishra
2f5d896f8c
fix: added wrong absent days calculation in salary slip
2020-11-12 16:57:42 +05:30
Deepesh Garg
b58dca8d94
fix: Only update open loans
2020-11-12 13:37:11 +05:30
Shivam Mishra
dc1e240642
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:33:47 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Jannat Patel
0ea0a7495c
fix: making company address read-only in delivery note ( #23890 )
2020-11-12 11:10:59 +05:30
marination
c1b0e65f9f
feat: Putaway
2020-11-12 09:54:44 +05:30
Rucha Mahabal
159d3bf14b
Merge branch 'develop' into production-planning-status-filter
2020-11-11 22:36:21 +05:30
Deepesh Garg
5e0f4e2f4b
Merge pull request #23582 from deepeshgarg007/loan_repayment_type_remove
...
fix: Loan repayment type option remove
2020-11-11 22:08:41 +05:30
Marica
a8ac101f5c
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 16:55:13 +05:30
Jannat Patel
a9e02bba77
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue
2020-11-11 16:46:01 +05:30
Mangesh-Khairnar
a91b68c868
feat: add communication channel to communication medium ( #23793 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-11 16:34:43 +05:30
Afshan
6c95bc5e11
fix: payroll attendance error
2020-11-11 15:13:38 +05:30
Deepesh Garg
a2dc1740df
fix: Use autoname for loan creation
2020-11-11 13:57:10 +05:30
Deepesh Garg
0dc052e635
fix: Return loan type name
2020-11-11 12:57:16 +05:30
Marica
78cccbe015
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 12:18:14 +05:30
Rushabh Mehta
780b6b466b
fix(hooks): include js/css with full path
2020-11-11 11:44:28 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 11:10:34 +05:30
Deepesh Garg
13d1dda74b
fix: Handle loan type naming collisions
2020-11-11 11:07:17 +05:30
Jannat Patel
e008f85816
Merge branch 'develop' into production-planning-status-filter
2020-11-11 10:00:39 +05:30
pateljannat
7e4d115e36
fix: sider issues fixed
2020-11-11 09:52:27 +05:30
Deepesh Garg
73bde45bc5
fix: Pass updated loan type
2020-11-10 22:08:02 +05:30
Deepesh Garg
1c969d64a2
fix: Handle cases where same loan type is used for multiple companies
2020-11-10 20:25:35 +05:30
pateljannat
b648b9cf93
fix: code review changes
2020-11-10 18:50:02 +05:30
pateljannat
d08c91673a
fix: removed unnecessary filter options
2020-11-10 18:04:30 +05:30
Deepesh Garg
101bad3ea1
fix: Remarks for penalty GL Entry
2020-11-10 17:53:50 +05:30
prssanna
922432616f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-10 17:24:15 +05:30
prssanna
e3b71b9b24
fix: compact item print style
2020-11-10 17:23:24 +05:30
Afshan
1e564bc02d
fix: refactor
2020-11-10 13:23:59 +05:30
Afshan
a75708b02e
Merge branch 'fix-po-no-fetching' of https://github.com/AfshanKhan/erpnext into fix-po-no-fetching
2020-11-10 13:19:53 +05:30
Afshan
1924019531
fix: refactor
2020-11-10 13:19:21 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Raffael Meyer
57ce0462d9
fix: remove check for exempt_from_sales_tax
2020-11-09 19:04:46 +01:00
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
2020-11-09 20:20:05 +05:30
Raffael Meyer
4f880e7454
refactor: zip_and_download ( #23844 )
2020-11-09 20:17:56 +05:30
Shivam Mishra
f38a1c305e
refactor: show form buttons only if permissions exist ( #23851 )
...
* refactor: show form buttons only if permissions exist
* style: add semicolon
* fix: typo in conditions
2020-11-09 20:16:28 +05:30
Deepesh Garg
8cfb210dc4
fix: Ignore doctypes on company transaction deleted ( #23864 )
2020-11-09 20:14:53 +05:30
UrvashiKishnani
bc64f5dfbb
fix: spelling error in filter label ( #23867 )
2020-11-09 20:14:06 +05:30
Suraj Shetty
e3fe8ff195
Merge branch 'develop' into purchase-taxes-and-charges-account-name-issue
2020-11-09 19:16:23 +05:30
Rucha Mahabal
30d58cc3d7
feat: Consider Holiday List in Student Leave Application and Attendance ( #23388 )
...
* feat: Consider holiday list in Student Attendance and Leave Application
* feat: Show Holidays as 'H' in Student Monthly Attendance Sheet
* fix: check if date is a holiday in attendance reports
* test: skip attendance record creation for holidays
* fix: holiday list validation
* fix: clean up after test
* fix: codacy
* fix: show date in user format
* fix: remove ununsed imports
* fix: sider
* fix: test
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-11-09 18:41:03 +05:30
Frappe PR Bot
7915a3acae
chore: Update translations ( #23856 )
...
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
2020-11-09 18:37:28 +05:30
Deepesh Garg
d53abf194e
fix: Party for loan ledger entries
2020-11-09 18:34:38 +05:30
rohitwaghchaure
8d39d7570a
Merge pull request #23764 from anupamvs/project-timesheet
...
fix: added project link in timesheet form
2020-11-09 17:34:11 +05:30
Deepesh Garg
928dc432ab
fix: Reload journal entry account doc
2020-11-09 17:17:12 +05:30
Deepesh Garg
4f2a64479d
fix: Patch for old loans
2020-11-09 17:00:09 +05:30
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 14:51:20 +05:30
Shivam Mishra
723e220a34
chore: remove commented code
2020-11-09 14:07:40 +05:30
Shivam Mishra
12fafa3e7a
chore: remove validation for old member field
2020-11-09 14:07:39 +05:30
Shivam Mishra
7e1cdf9b97
feat(breaking): update get_last_membership to fetch correct details
2020-11-09 14:07:39 +05:30
Shivam Mishra
c04321e645
test(membership): add test for invoicing and validation
2020-11-09 14:06:53 +05:30
Shivam Mishra
286ec04197
test(membership): setup test defaults
2020-11-09 14:06:23 +05:30
Shivam Mishra
e0f4dd0643
fix: fieldtype for auto_create_for_web_forms
2020-11-09 14:06:23 +05:30
Shivam Mishra
9d9fa74e6b
refactor(member): drop email column
...
* remove email column
* update controller methods
* add patch to add value from email to email_id
2020-11-09 14:06:23 +05:30
Shivam Mishra
d75ff1a93e
feat: generate invoice on payment authorized
2020-11-09 14:06:23 +05:30
Shivam Mishra
e927224fbc
feat: update membership setting doctype
...
* rename enable_auto_invoicing to enable_invoicing
* add option to make_payment entry
2020-11-09 14:05:39 +05:30
Suraj Shetty
1183980e0e
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-09 13:14:11 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
2020-11-09 12:59:10 +05:30
rohitwaghchaure
94bfa6a659
Merge pull request #23843 from frappe/datev_check_fiscal_year
...
feat: validate fiscal year
2020-11-09 12:33:15 +05:30
Marica
f72a5a6dca
Merge branch 'develop' into pr-dn-return
2020-11-09 12:19:36 +05:30
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 10:33:32 +05:30
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
2020-11-09 10:29:51 +05:30
Deepesh Garg
29a8994506
Merge pull request #23832 from deepeshgarg007/india_tax_template_fetch
...
fix: Auto Statewise gst tax template
2020-11-08 17:48:57 +05:30
Deepesh Garg
dd94587ef8
fix: Loan write off precision issue
2020-11-07 17:08:30 +05:30
Deepesh Garg
2ad015450e
fix: Remarks fix
2020-11-07 00:14:40 +05:30
Mohammad Hasnain Mohsin Rajan
d54969bd86
Merge branch 'develop' into UAE-VAT-Format
2020-11-06 23:39:34 +05:30
Mohammad Hasnain
c5aad7b6e5
feat(UAE VAT 201): reorder desk page listing
2020-11-06 23:36:50 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saurabh
7c06c28216
fix: merge-conflicts
2020-11-06 19:08:58 +05:30
Saurabh
e7ab61da9a
bumped to version 13.0.0-beta.5
2020-11-06 19:23:55 +05:50
rohitwaghchaure
8cbcd54f3b
chore: change log for v13-beta-pre-release-5 ( #23846 )
2020-11-06 18:48:34 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
2020-11-06 18:19:36 +05:30
Saqib
1090181204
fix: auto fetch sr nos with modifed conversion factor ( #23855 )
2020-11-06 18:19:26 +05:30
Deepesh Garg
3899079bb9
fix: Loan seurity unpledge msg improvement
2020-11-06 17:39:54 +05:30
Anupam Kumar
bdb8a4023a
Delete test_parameter.py
2020-11-06 17:13:02 +05:30
Anupam Kumar
a739554b7d
Delete parameter.py
2020-11-06 17:12:44 +05:30
