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

44554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Sharma
5faa62c49a
Merge branch 'develop' into fix-so-on-hold 2023-02-14 11:06:10 +05:30
rohitwaghchaure
3014bac293
Merge pull request #34046 from FHenry/dev_fix_BOM_import 
fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table
 2023-02-14 10:29:26 +05:30
ruthra kumar
00a4191966 fix: typeerror on Sales Order analysis report 2023-02-14 09:56:35 +05:30
Raffael Meyer
770369e5c1
feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 09:29:27 +05:30
Florian HENRY
86be259341 fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table 2023-02-13 23:34:20 +01:00
Deepesh Garg
ce748cec3a
fix: Amount validation in Payment Request against Purchase Order (#34042) 2023-02-13 20:56:24 +05:30
HENRY Florian
231fe4156f
fix: should never get cutomer price on purchase document (#34002) 
* fix: never get cutomer price on purchase document

chores: syntax

chore: typo in stock_entry get_uom_details (#33998)

fix: typo in stock_entry get_uom_details

chores: syntax

* feat: add test for get_item_detail price list oriented

* feat: add test for get_item_detail price price oriented

* feat: add test for get_item_detail price price oriented

* chore: clean test code
 2023-02-13 20:56:05 +05:30
anandbaburajan
c533213225 fix: opening_accumulated_depreciation and precision in charts 2023-02-13 17:22:31 +05:30
Deepesh Garg
ff4ae69408
Merge branch 'develop' into gross_profit_memory_and_performance_issue 2023-02-13 15:38:26 +05:30
Deepesh Garg
a67284e96d
fix: Concurrency issues in Sales and Purchase returns (#34019) 2023-02-13 15:31:19 +05:30
ruthra kumar
4f2553e7b6
Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation 
fix: rare instances of IntegrityError while cancelling journals against cr note
 2023-02-13 14:14:27 +05:30
ruthra kumar
192a3395a5
refactor: filter only immediate upcoming payment term for each SO (#33923) 
* fix: ignore closed or 'on hold' orders

* refactor: filter immediate upcoming term

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:36:40 +05:30
ruthra kumar
e5a2b15fba
fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) 
* fix: incorrect difference amount while reconiling cr/dr notes

* fix(test): catch incorrect difference amount calculation

Fixed issues where difference amount was calculated for Cr Notes and Invoices of
the same currency.

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-13 12:08:42 +05:30
Deepesh Garg
148703bfc2
feat: Setting to allow Sales Order creation against expired quotation (#33952) 
* feat: Setting to allow Sales Order creation against expired quotation

* chore: linting issues
 2023-02-13 10:27:55 +05:30
Deepesh Garg
ce3f9622cb
Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation 2023-02-13 09:42:41 +05:30
Deepesh Garg
48bb2c942b
fix: Ignore Payment Ledger Entry on dunning cancel (#34025) 
* fix: Ignore Payment Ledger Entry on dunning cancel

* chore: fix translation issue
 2023-02-13 09:42:01 +05:30
Deepesh Garg
77f6789706
Revert "Update tr.csv" (#34026) 
Revert "chore: Update Turkish translations (#33985)"

This reverts commit 6ea0a69d3a.
 2023-02-13 08:27:00 +05:30
ruthra kumar
3e5691072a perf: fetch SLE's on demand and memoize 2023-02-12 14:49:17 +05:30
ruthra kumar
b9a7ff7c3d fix: IntegrityError while cancelling journals against cr note 2023-02-12 14:06:40 +05:30
Sagar Sharma
b0e8dfc1d0
Merge branch 'develop' into fix-so-on-hold 2023-02-12 13:37:21 +05:30
s-aga-r
d76759e066 fix: update reserved_qty when Sales Order marked as Hold 2023-02-12 13:36:26 +05:30
Richard Case
a0eb5e5535
fix: add payment hook to point of sale JS (#33988) 2023-02-11 20:40:15 +05:30
Raffael Meyer
e4953df4a3
fix: set per_billed based on hours when amounts are zero (#33984) 
* fix: set per_billed based on hours when amounts are zero

* test: calculate_percentage_billed
 2023-02-11 12:36:37 +05:30
Sabu Siyad
0df28c7174
fix(ecommerce): throw invalid doctype error in shop by category (#33901) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 12:28:42 +05:30
Raffael Meyer
201573ab9a
refactor: install fixtures (#33964) 
* refactor: install fixtures

* style: disable semgrep for install_defaults signature
 2023-02-11 12:15:42 +05:30
Deepesh Garg
0efdc6c13a
fix: Ignore mandatory fields while creating tax templates for new companies (#34005) 2023-02-11 12:03:48 +05:30
Raffael Meyer
ab7293bcd3
fix: list view for Terms and Conditions (#33925) 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-11 11:09:26 +05:30
Mehmet Demirel
6ea0a69d3a
chore: Update Turkish translations (#33985) 
We are the ERPNext Turkey Team.
We request confirmation of the translation we sent.
 2023-02-11 09:27:18 +05:30
Deepesh Garg
e478a5d0ce
feat: Add filters in Loan Interest Report (#33907) 2023-02-11 09:17:24 +05:30
Deepesh Garg
47c91324b1
fix: Amount for debit and credit notes with 0 qty line items (#33902) 2023-02-11 09:04:00 +05:30
Akshay
185c543b73
chore: typo in stock_entry get_uom_details (#33998) 
fix: typo in stock_entry get_uom_details
 2023-02-10 20:42:35 +05:30
Marica
bd7e6e264e
Merge branch 'develop' into alternative-items-quotation 2023-02-06 16:30:10 +05:30
marination
db2076db69 refactor: Order based alternative items mapping 
- Alternatives must be followed by a non-alternative item row
- On submit, store non-alternative rows in hidden checkbox to avoid recomputation
- Check for valid/mappable rows by row name
- UI: Select from table rows.Add single row for original/alternative item in dialog
- UI: Indicator for alternative items in dialog grid
- UI: Indicator legend and description of table
- DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg
 2023-02-06 16:25:38 +05:30
Anand Baburajan
9d8502f406
Merge pull request #33946 from AnandBaburajan/cancel_pi_cancelled_asset 
fix: allow cancelling purchase invoice if linked asset is already cancelled
 2023-02-05 16:06:47 +05:30
Anand Baburajan
4686217d3c
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-05 14:14:39 +05:30
Anand Baburajan
52435a3a7f
Merge pull request #33945 from AnandBaburajan/manual_depr_entries_develop 
fix: manual depr entry not updating asset value [develop]
 2023-02-05 14:14:19 +05:30
Anand Baburajan
396f455258
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-05 12:19:21 +05:30
Anand Baburajan
f8270f093d
Merge branch 'develop' into manual_depr_entries_develop 2023-02-05 12:19:17 +05:30
Sagar Sharma
05f4b659a7
Merge pull request #33942 from s-aga-r/github-issue-33533 
fix: stock entry from item dashboard (stock levels)
 2023-02-05 09:46:27 +05:30
Sagar Sharma
2fedd595a9
Merge branch 'develop' into github-issue-33533 2023-02-05 09:36:17 +05:30
rohitwaghchaure
0352e1dace
Merge pull request #33936 from rohitwaghchaure/fixed-negative-stock-error 
fix: negative stock error
 2023-02-04 23:34:56 +05:30
rohitwaghchaure
7d794bc70a
Merge branch 'develop' into fixed-negative-stock-error 2023-02-04 22:35:58 +05:30
rohitwaghchaure
67b5471d09
Merge pull request #33941 from developsessions/fix_wrong_due_date_calculation 
fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)
 2023-02-04 22:34:47 +05:30
Anand Baburajan
82490d9f55
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-04 18:37:34 +05:30
Anand Baburajan
07a0e2b7a8
Merge branch 'develop' into manual_depr_entries_develop 2023-02-04 18:37:34 +05:30
developsessions
c8cd351b39 style: apply results of lint run 2023-02-04 09:12:29 +01:00
Sagar Sharma
4a6a7593c3
Merge pull request #33940 from s-aga-r/github-issue-33917 
chore: report `Warehouse wise Item Balance Age and Value`
 2023-02-04 13:27:57 +05:30
anandbaburajan
3380dc5dea chore: use continue, not break 2023-02-04 11:20:26 +05:30
developsessions
9d0096ad9e fix: failed test, convert date time to string 2023-02-03 21:21:43 +01:00
Anand Baburajan
bb424965ee
Merge branch 'develop' into cancel_pi_cancelled_asset 2023-02-03 23:00:40 +05:30