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

34491 Commits

Author SHA1 Message Date
Solufyin
71de72bdd0
fix: Set contact filter link in Opportunity (#34325) 
Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>
 2023-03-07 17:44:31 +05:30
Devin Slauenwhite
6de826b8c4
fix: exchange rate revaluation errors (#33947) 
* fix: set new balance for non-positive balances

* fix: don't add debit: 0, credit: 0 entries to journal entry.

* fix: add journal entry difference to unbooked gain/loss of exchange.

* chore: linter

* chore: remove invlaid TODO. [skip-ci]
 2023-03-07 17:16:15 +05:30
Marica
2feb27e399
fix(minor): Dirty the form after clicking on Get advances button in Invoices (#34323) 
fix(minor): Dirty form after clicking on Get advances button
 2023-03-07 15:45:18 +05:30
Deepesh Garg
10632d75b0
fix: Do not calculate commission post submit (#34267) 
* fix: Do not calculate commision post submit

* chore: Update condition to match server side logic

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-03-07 11:44:09 +05:30
Deepesh Garg
7d0199d743
fix: Default sales team not getting set (#34284) 2023-03-07 11:41:26 +05:30
Deepesh Garg
ea8e23384d
fix: Payment Request against sales order with disabled rounded total (#34281) 
* fix: Payment Request against sales order with disabled rounded total

* chore: Do not consider advance amount
 2023-03-07 11:40:29 +05:30
rohitwaghchaure
53efc8ff77
Merge pull request #34305 from rohitwaghchaure/fixed-not-able-to-complete-bom-update-log 
fix: BOM Update log not completed
 2023-03-06 23:23:58 +05:30
Rohit Waghchaure
2f157fa5d3 fix: BOM Update log not completed 2023-03-06 12:09:50 +05:30
barredterra
502a37a864 refactor: use renamed timezone utils 
https://github.com/frappe/frappe/pull/20253
 2023-03-04 19:31:40 +01:00
s-aga-r
70de444b7b fix: Stock Reconciliation actual_qty 2023-03-04 17:06:07 +05:30
s-aga-r
e6a02719f7 fix: update inventory dimensions before returning sle 2023-03-04 16:02:50 +05:30
s-aga-r
0e1b7760a8 fix: Inventory Dimension for Stock Reconciliation 2023-03-04 01:05:55 +05:30
Deepesh Garg
c3d455653e
Merge pull request #34258 from deepeshgarg007/finance_book_read_only 
chore: Make finance book read only
 2023-03-02 16:47:47 +05:30
Sagar Sharma
90e1a6bc16
Merge branch 'develop' into github-issue-33344 2023-03-02 14:24:14 +05:30
Sagar Sharma
6e9d001819
Merge branch 'develop' into github-issue-33344 2023-03-02 12:09:21 +05:30
Sagar Sharma
50dc0c18eb
Merge branch 'develop' into fix-return-pr-serial-no 2023-03-02 12:06:59 +05:30
Ankush Menat
330ae419be
fix!: Parse float as per number format in quality inspection (#34259) 
fix: Parse float as per number format in quality inspection
 2023-03-02 11:59:18 +05:30
s-aga-r
cb0b6de4b9 fix: Serial No is mandatory even if the qty is 0 2023-03-02 11:27:46 +05:30
s-aga-r
a9f0a11ce6 fix: rejected_serial_no not getting copied from PR to PR(Return) 2023-03-02 11:15:46 +05:30
Deepesh Garg
790f0aac12
Merge branch 'develop' into finance_book_read_only 2023-03-02 10:01:12 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation 
feat: Support for Alternative Items in Quotation
 2023-03-01 17:41:24 +05:30
Suraj Shetty
6cd2ba5c66 fix: Resolve conflicts 
(cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)
 2023-03-01 10:59:21 +00:00
Suraj Shetty
46a722d51c fix: Wrap unexpectedly long text in remark 
(cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e)

# Conflicts:
#	erpnext/accounts/report/general_ledger/general_ledger.html
(cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)
 2023-03-01 10:59:20 +00:00
Deepesh Garg
28dd1a25cb chore: Make finance book read only 2023-03-01 15:00:24 +05:30
Rohit Waghchaure
b38fe24090 fix: consumed qty validation for subcontracting receipt 2023-03-01 11:42:59 +05:30
rohitwaghchaure
d88fe27be6
Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item 
fix: Performance improvement when adding a new item
 2023-03-01 10:10:14 +05:30
ruthra kumar
f9c75055bb
Merge pull request #34241 from ruthra-kumar/bug_on_credit_note_creation 
fix: pos return throwing amount greater than grand total
 2023-02-28 18:22:30 +05:30
rohitwaghchaure
9bb8e351a2
Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports 
fix: default date in Subcontracting reports
 2023-02-28 18:01:14 +05:30
Rohit Waghchaure
dfddc4efc3 fix: default date in Subcontracting reports 2023-02-28 17:53:51 +05:30
rohitwaghchaure
2942cee31e
Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate 
feat: adjust purchase receipt valuation rate as per purchase invoice rate
 2023-02-28 17:34:53 +05:30
ruthra kumar
35c70f39fa fix: pos return throwing amount greater than grand total 2023-02-28 16:21:32 +05:30
Rohit Waghchaure
a8445da02a fix: labels name 2023-02-28 15:47:45 +05:30
s-aga-r
58c027d4cc chore: Linters 2023-02-28 15:14:34 +05:30
Sagar Sharma
26ced47ddc
Merge branch 'develop' into github-issue-33344 2023-02-28 15:01:40 +05:30
Rohit Waghchaure
8e86553717 test: added test cases 2023-02-28 14:57:04 +05:30
Rohit Waghchaure
eab775ef32 feat: adjust purchase receipt valuation rate as per purchase invoice rate 2023-02-28 14:11:55 +05:30
Vishal
f18ae5856f chore: minor changes in pos_controller 2023-02-28 11:03:26 +05:30
Vishal
a51bec0269 chore: minor change 2023-02-28 11:03:26 +05:30
Vishal
3ebe7d861d chore: minor changes added to code 2023-02-28 11:03:26 +05:30
Vishal
1de531e56e fix: multiple pos conversion issue resolved 2023-02-28 11:03:25 +05:30
Sagar Sharma
ecd15d2a65
Merge branch 'develop' into github-issue-33344 2023-02-27 16:57:29 +05:30
s-aga-r
c09a61f360 fix: set from_warehouse and to_warehouse while mapping SE 2023-02-27 12:26:21 +05:30
Sagar Sharma
bda1340760
Merge branch 'develop' into patch-2 2023-02-27 11:52:31 +05:30
Patrick Eissler
bbb6a62a7d
chore: add german translations (#34167) 
* chore: add german translations

* Apply suggestions from code review

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-02-27 11:49:22 +05:30
Deepesh Garg
81651beaef
Merge pull request #34174 from Vishnu7025/coa-import-currency 
fix: currency in coa import
 2023-02-27 11:48:44 +05:30
Sagar Sharma
5dcb723fc7
Merge branch 'develop' into patch-2 2023-02-27 11:14:14 +05:30
Brian Pond
83f3e317e1 fix: Remove missing DocField in fetch_from 2023-02-27 11:10:51 +05:30
ruthra kumar
d8b9b83b11
Merge pull request #34207 from ruthra-kumar/fix_permisssion_error_on_work_order_creation 
fix: permission error while calling get_work_order_items
 2023-02-27 09:55:18 +05:30
Anand Baburajan
feeebb1262
Merge branch 'develop' into manual_asset_schedule_develop 2023-02-26 17:40:26 +05:30
anandbaburajan
dd74839eba fix: manual depr schedule 2023-02-26 17:36:36 +05:30