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

44964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
986daa6578 fix: enclose ternary operator in parentheses 2023-03-31 12:09:57 +05:30
Deepesh Garg
576575c227
fix: Column value mismatch in COA blank template (#34658) 2023-03-31 11:10:50 +05:30
s-aga-r
706be2a415 chore: make Production Plan Item Reference table hidden in Production Plan 2023-03-31 10:32:49 +05:30
Deepesh Garg
7c42b72ee7
fix: Total debit and credit while importing via Data Import (#34659) 2023-03-30 17:28:19 +05:30
rohitwaghchaure
edb0666b2c
Merge branch 'develop' into fix-reserve-qty 2023-03-30 17:26:32 +05:30
rohitwaghchaure
c4a0842a4f
Merge pull request #34636 from rohitwaghchaure/posting-time-issue 
fix: posting time issue
 2023-03-30 17:25:47 +05:30
rohitwaghchaure
06eac67796
Merge pull request #34664 from rohitwaghchaure/fixed-incorrect-balance-qty-stock-ledger 
fix: incorrect balance qty in the stock ledger report
 2023-03-30 17:25:35 +05:30
Richard Case
ddb17a8880
fix: plaid log_error syntax issue (#34642) 2023-03-30 16:45:56 +05:30
Anand Baburajan
d999dea3e4
chore: improve asset depr posting failure msg (#34661) 
* chore: improve asset depr posting error msg

* chore: add period

* chore: improve msg
 2023-03-30 16:38:37 +05:30
Rohit Waghchaure
345e6facbe fix: posting time issue 2023-03-30 16:34:34 +05:30
Rohit Waghchaure
cbdaab940d fix: incorrect balance qty in the stock ledger report 2023-03-30 16:20:42 +05:30
Anand Baburajan
a7a45fbe59
Merge pull request #34660 from AnandBaburajan/asset_improvements_30_mar_develop 
chore: auto fill asset name and available for use date
 2023-03-30 16:07:59 +05:30
anandbaburajan
af3e807607 chore: auto fill asset name and available for use date 2023-03-30 15:28:59 +05:30
Sagar Sharma
b6c0a675f9
Merge branch 'develop' into FIX-33830 2023-03-30 13:49:41 +05:30
s-aga-r
a4112c75c5 fix: BOM Update Cost, when no actual qty 2023-03-30 13:46:50 +05:30
rohitwaghchaure
448afa2b7c
Merge pull request #34648 from rohitwaghchaure/fixed-serial-no-qty-issue-in-stock-reco 
fix: serial no with zero quantity issue in stock reco
 2023-03-30 13:04:48 +05:30
Anand Baburajan
0ac81e3793
Merge pull request #34649 from AnandBaburajan/asset_value_adjustment_asset_name 
fix: incorrect arg name in asset value adjustment
 2023-03-30 13:03:18 +05:30
Anand Baburajan
33ff1b5a72
Merge branch 'develop' into asset_value_adjustment_asset_name 2023-03-30 12:53:06 +05:30
anandbaburajan
2b0470d1f5 fix: incorrect arg name in asset value adjustment 2023-03-30 12:50:33 +05:30
Rohit Waghchaure
17131e5a02 fix: serial no with zero quantity issue in stock reco 2023-03-30 11:47:32 +05:30
Komal-Saraf0609
ad11934d39
fix: enabling lead even after "Opportunity" created against it (#34627) 
* fix: enabling lead even after "Opportunity" created against it

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-30 08:03:55 +05:30
Anand Baburajan
7c5720ddb3
Merge pull request #34641 from frappe/mergify/bp/develop/pr-34607 
Asset maintenance task add dropdown "3 Yearly" (backport #34607)
 2023-03-29 18:15:17 +05:30
Bevan Tony Medrano
ddc3050e99 Asset maintenance task add dropdown "3 Yearly" (#34607) 
* feat(asset_maintenance.json):Add 3 yearly in periodicity dropdown

* add server side implications for 3 yearly

(cherry picked from commit 625b8e800537cceabffda50a0bbed1effc2e2aa5)
 2023-03-29 12:16:03 +00:00
Raffael Meyer
f5453adf4d
fix: switch to supported update_linked_doctypes (#34625) 2023-03-29 16:59:10 +05:30
Komal-Saraf0609
d0660ad222
fix: lost opportunity report issue (#34626) 
* fix: lost opportunity report issue

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-29 16:51:18 +05:30
s-aga-r
517b5f8567 refactor: rewrite batch.py queries in QB 2023-03-29 14:02:09 +05:30
Sagar Sharma
867d898304
fix: zero rm-cost for batch rm item in SCR (#34616) 
fix: `0` rm-cost for batch rm item in SCR
 2023-03-28 18:45:16 +05:30
rohitwaghchaure
738dd57904
Merge pull request #34461 from s-aga-r/FIX-ISS-22-23-05936 
fix: incorrect `Opening Value` in `Stock Balance` report
 2023-03-28 17:40:25 +05:30
akiratfli
07c9b99072
fix: bad strings format for update-translations (#34592) 
Co-authored-by: justin.li <justin.li@lungteh.com>
 2023-03-28 17:20:54 +05:30
ruthra kumar
7c13533f30
Merge pull request #34608 from ruthra-kumar/reconciliation_debit_credit_mismatch 
chore: removing redundant validation
 2023-03-28 16:54:37 +05:30
Vishal Dhayagude
7aafc90d58
fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525) 
* fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set

* fix: minor change added
 2023-03-28 16:48:03 +05:30
Devin Slauenwhite
393bc25e2d
fix: don't get zero value entries for exchange rate calculation (#34475) 
* fix: multiply None by float

* chore: remove debug
 2023-03-28 16:34:24 +05:30
Deepesh Garg
50c1172f29
fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) 
fix: Party Name in SOA print when viewd from Customer/Supplier master
 2023-03-28 15:36:16 +05:30
Deepesh Garg
12ad2aa2e5
fix: Percentage billing in Sales Order (#34606) 2023-03-28 15:33:59 +05:30
Marica
dae40dfbb4
Merge branch 'develop' into early-payment-loss 2023-03-28 15:01:28 +05:30
ruthra kumar
d52f7e2820 fix: removing redundant validation 2023-03-28 13:44:23 +05:30
Devin Slauenwhite
3c553b0938 feat: don't reserve qty on sales return 2023-03-27 10:37:54 -04:00
Devin Slauenwhite
17f8080168 chore: revert get_reserve_qty method 2023-03-27 10:37:04 -04:00
marination
216a46bd66 feat: Make Tax loss booking optional 
- Checkbox in Accounts Settings
- Apply checkbox in PE deductions setting logic
- Adjust tests
 2023-03-27 16:11:00 +05:30
=
1142e69d1a Merge branch 'develop' into fix-reserve-qty 
# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
 2023-03-24 23:50:50 -04:00
ruthra kumar
f7780cdb58
refactor: additional filters and columns in Payment Ledger report (#34577) 
1. 'Party type' and 'Party' filters have been added
2. checkbox to include Amount in Acccount Currency
3. Grouping vouchers on Party
4. Replaced Company with Posting Date
 2023-03-24 12:25:03 +05:30
Raffael Meyer
8c7fa5712b
feat: deprecate get_customer_list (#34563) 2023-03-24 12:13:53 +05:30
Shram Kadia
0cd870fc29
fix: get batch_no. for item automatically (#34473) 
* fix: default pos conversion factor set to 1

* fix:get-batch-no-of-item-automatically
 2023-03-24 12:05:26 +05:30
Nabin Hait
282a0ee2ce
Merge pull request #34257 from deepeshgarg007/opening_entry 
feat: Closing balance for period closing and reporting
 2023-03-24 11:59:00 +05:30
rohitwaghchaure
980cca1772
Merge pull request #34573 from rohitwaghchaure/timer-buttons-not-working 
fix: Time buttons not working in the job card
 2023-03-23 22:35:43 +05:30
Rohit Waghchaure
34c190b7d6 fix: Time button not working in the job card 2023-03-23 22:32:11 +05:30
Anand Baburajan
e6b0196493
fix: recalculate wdv rate after asset repair [develop] (#34570) 
fix: recalculate wdv rate after asset repair
 2023-03-23 21:10:22 +05:30
Deepesh Garg
87108be11a
fix: Sales person variance report without item group (#34552) 
fix: Sales person variance report witout item group
 2023-03-23 19:19:46 +05:30
Deepesh Garg
8ce1da111e chore: Improve validation message 2023-03-23 19:14:12 +05:30
Deepesh Garg
f8cff09129 fix: CS financial statement param 2023-03-23 19:12:42 +05:30