Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,517 Commits 3 Branches 0 Tags 1 GiB
301092dad1
Commit Graph

36372 Commits

Author SHA1 Message Date
Abdo
6f4f5be990
chore: Translate Voucher Type in General Ledger Report (#36874) 
chore: Translate Voucher Type in  General Ledger Report
 2023-09-13 20:38:45 +05:30
ViralKansodiya
96363dbb07
fix: Remove redundant code (#37001) 
fix: Remove redundant code
 2023-09-13 20:34:20 +05:30
Deepesh Garg
7711744020
Merge pull request #37032 from HarryPaulo/auth-rule-based-on-item-group 
feat: created "based on" Item Group to specify a different percentage…
 2023-09-13 20:27:34 +05:30
Deepesh Garg
1db05c80e1
Merge pull request #37031 from HarryPaulo/fix-auth-rule-based-on 
fix: "Based on" field always has the value "Not applicable"
 2023-09-13 20:26:28 +05:30
Deepesh Garg
6664bc98a0
Merge pull request #37041 from vorasmit/fix-advances 
fix: multiple fixes for booking advances in seperate account
 2023-09-13 20:24:57 +05:30
marination
8a4954d713 test: Impact on SO of advance PE submit and unlinking/replacement by SI 2023-09-13 19:09:03 +05:30
s-aga-r
d2f3286115 fix: ignore user permissions for From Warehouse in PR 2023-09-13 16:26:29 +05:30
Deepesh Garg
7bfd487b25
Merge pull request #36364 from SvbZ3r0/develop 
fix: Naming Series preview when no previous transaction present
 2023-09-13 15:17:51 +05:30
Deepesh Garg
1d014122c1
Merge pull request #36980 from anandbaburajan/SI_DI_internal_and_external_links 
fix: + btn not appearing for delivery note connection
 2023-09-13 15:16:11 +05:30
marination
426350eee6 fix: Update advance_paid in SO/PO after unlinking from advance entry 2023-09-13 14:24:56 +05:30
s-aga-r
b83d880d66
Merge pull request #37046 from s-aga-r/FIX-1081 
fix: Purchase Receipt Provisional Accounting GL Entries
 2023-09-13 14:21:59 +05:30
rohitwaghchaure
0e83190c19
fix: incorrect stock ledger entries in DN (#36944) 2023-09-13 13:34:40 +05:30
s-aga-r
1c78a5a9aa test: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 12:28:18 +05:30
s-aga-r
74272a2e28 fix: patch to delete Woocommerce Settings DocType 2023-09-13 12:02:27 +05:30
s-aga-r
328ba4b656 refactor!: remove woocommerce 2023-09-13 11:50:04 +05:30
s-aga-r
6bab0eeaa1 fix: Purchase Receipt Provisional Accounting GL Entries 2023-09-13 11:24:10 +05:30
rohitwaghchaure
e6c302a397
fix: test case (#37063) 2023-09-13 11:22:43 +05:30
Deepesh Garg
88f7e57edf
Merge pull request #37055 from deepeshgarg007/dimension_filters_gl 
fix: Apply dimension filter, irrespective of dimension columns
 2023-09-13 10:05:58 +05:30
ruthra kumar
5898a6f48e
Merge pull request #37057 from ruthra-kumar/packed_item_picking_expired_price 
fix: Packed item incorrectly picks expired price on Sales Order
 2023-09-13 08:18:47 +05:30
ruthra kumar
055156d28a test: expired item price should not be picked 2023-09-13 07:48:59 +05:30
ruthra kumar
47ffa4983c fix: packed item using expired price 2023-09-13 06:03:12 +05:30
Deepesh Garg
1f02fb3bd9
Merge pull request #37017 from anandbaburajan/company_tabs 
chore: add tabs for company doctype
 2023-09-12 22:41:23 +05:30
Deepesh Garg
769db0b3bc fix: Apply dimension filter, irrespective of dimesion columns 2023-09-12 21:14:08 +05:30
HarryPaulo
da54ab5b3d fix: linters 2023-09-12 09:43:11 -03:00
rohitwaghchaure
9a23ba53c5
fix: button to make BOMs (#37049) 
fix: custom button to make BOMs
 2023-09-12 17:19:12 +05:30
mergify[bot]
93af6f6a1b
feat: provision to set required by from Production Plan (backport #37039) (#37040) 
feat: provision to set required by from Production Plan (#37039)

* feat: provision to set the Required By date from production plan

* test: added test case for validate schedule_date

(cherry picked from commit d278b116030df0f272c3c101b75fe3b66a344c04)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-12 16:29:02 +05:30
Smit Vora
c09807845f fix: ensure correct preview and set latest transaction date 2023-09-12 13:25:51 +05:30
s-aga-r
3c6e527dd1
Merge pull request #37025 from s-aga-r/FIX-883 
fix: `Parent Task` link with `Project Task`
 2023-09-12 06:59:45 +05:30
HarryPaulo
623239d3f7 feat: created "based on" Item Group to specify a different percentage for each item group 2023-09-11 18:14:38 -03:00
HarryPaulo
fae640c56f fix: "Based on" field always has the value "Not applicable" 2023-09-11 17:57:31 -03:00
marination
2ad62be2c7 chore: Convert db.sql to QB queries 2023-09-12 00:00:06 +05:30
s-aga-r
0d5c8f03bd test: add test case for Task having common subject 2023-09-11 22:36:58 +05:30
marination
b9750f324b fix: Remove get_matching_vouchers_for_bank_reconciliation 
- There should only be one hook to add queries to `get_linked_payments`
- `get_matching_queries` will be the only hook just like before
 2023-09-11 21:51:10 +05:30
s-aga-r
5cae2e79bd fix: reload task before save 2023-09-11 20:36:27 +05:30
s-aga-r
d3295c43e3 fix: set Template Task ref in Project Task 2023-09-11 20:36:11 +05:30
s-aga-r
b4bcd9ba3f feat: new field in Task to hold ref of Template Task 2023-09-11 20:35:12 +05:30
Smit Vora
43061f4416 fix: correct set_query filters 2023-09-11 19:16:25 +05:30
s-aga-r
d739ab6ee3
fix(ux): docstatus filter for Reference Name in QI (#37024) 2023-09-11 18:52:31 +05:30
anandbaburajan
dda4c5ec59 chore: add tabs for company doctype 2023-09-10 22:06:28 +05:30
s-aga-r
ce549ce9b2
fix(ux): filters for SCR Item Serial and Batch Bundle (#37013) 2023-09-10 17:10:04 +05:30
Bernd Oliver Sünderhauf
846ae32d92
feat: Add half-yearly asset maintenance periodicity. (#37006) 2023-09-10 17:00:01 +05:30
Deepesh Garg
b34c03d306
Merge pull request #36843 from GursheenK/process-soa-pdf-name 
fix: show customer name for naming series in process soa
 2023-09-10 12:20:53 +05:30
Deepesh Garg
c849a012d5
Merge pull request #36974 from GursheenK/tax_withholding_category_base_total_for_si 
fix: tax category field in tax withholding details report
 2023-09-10 11:40:36 +05:30
barredterra
3e0a795028 chore: migrate translations to frappe 2023-09-10 00:21:41 +02:00
barredterra
2a77b50191 chore: migrate translations from frappe 2023-09-10 00:17:02 +02:00
ruthra kumar
d398775715 test: multi currency invoice unreconciliation 
exchange gain/loss associated with the unreconcile invoice should be
cancelled as well
 2023-09-09 07:30:58 +05:30
ruthra kumar
5c09fdf941 refactor(test): more modularization 2023-09-09 06:54:50 +05:30
ruthra kumar
1d93d66c30 refactor: cancel gain/loss JE on multi currency transactions 2023-09-08 21:29:13 +05:30
Anand Baburajan
034322c53f
fix: correct asset daily depr schedule calculation [dev] (#36993) 
fix: correct asset daily depr schedule calculation
 2023-09-06 22:20:38 +05:30
Deepesh Garg
c2f8f1d028
Merge pull request #36983 from deepeshgarg007/employee_utils 
chore: Update employee for tests
 2023-09-06 16:31:29 +05:30
Sagar Vora
1b853857aa chore: remove unused variable job 2023-09-06 14:14:22 +05:30
Deepesh Garg
ae01d70b33 chore: Update employee for tests 2023-09-06 13:19:00 +05:30
Anand Baburajan
0077659e93
chore: asset finance books validation (#36979) 2023-09-06 12:44:07 +05:30
Devin Slauenwhite
8ce6b8179e
fix: use primary key for link lookup (#36919) 2023-09-06 11:44:45 +05:30
anandbaburajan
e1a94a9ba1 fix: move SI and DI connected links to internal_and_external_links 2023-09-05 21:38:06 +05:30
Gursheen Anand
175870ce8d test: tax withholding details report 2023-09-05 18:51:41 +05:30
Gursheen Anand
8eea4eb56e fix: remove tax category from common fields 2023-09-05 18:50:53 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed (#36960) 
* fix: only ask for asset_received_but_not_billed account when needed

* chore: remove unnecessary if condition

* fix: only ask for expenses_included_in_asset_valuation account when needed
 2023-09-05 17:45:23 +05:30
s-aga-r
f809e12747
fix: ignore mandatory fields while saving WO (#36954) 2023-09-05 16:27:17 +05:30
ruthra kumar
ccd2e2b086
Merge pull request #36963 from ruthra-kumar/index_error_on_receivable_report 
fix: index error on Receivable report based on payment terms
 2023-09-05 16:12:38 +05:30
ruthra kumar
b9c556c4a9 fix: index error on Receivable report based on payment terms 
cr note's don't have payment terms. So, skip for them.
 2023-09-05 15:07:07 +05:30
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student (#36920) 
* fix: payment recon not showing payment entry when party_type is Student

* chore: code cleanup

* fix: payment recon based on account_type which is fetched from Party Type master
 2023-09-05 12:00:54 +05:30
ruthra kumar
5dbcf7d2b9 refactor: only cancel specific gain/loss je 2023-09-05 09:52:36 +05:30
ruthra kumar
6fd1c1bca2 refactor: display allocated amount in account currency with symbol 2023-09-05 09:34:01 +05:30
ruthra kumar
9a1588f1cc fix: typo in doctype name and qb 2023-09-05 08:34:26 +05:30
ruthra kumar
67980188a7 test: more granular unreconciliation 2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6 refactor: unlink individual vouchers from payments 2023-09-05 08:34:26 +05:30
ruthra kumar
b4dc2bdf28 chore: type info 2023-09-05 08:34:26 +05:30
ruthra kumar
0130aea2aa refactor: convert raw sql to query_builder 2023-09-05 08:34:26 +05:30
ruthra kumar
de910ab152 refactor: single fetch and unlinking logic for JE and PE 2023-09-05 08:34:26 +05:30
ruthra kumar
285963acdb feat: unreconcile support for journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
cce96669f0 refactor: modularisation and group by voucher_no 2023-09-05 08:34:26 +05:30
ruthra kumar
0ccb6d8242 chore: rename and add trigger in journal entry 2023-09-05 08:34:26 +05:30
ruthra kumar
69683776a5 chore: code cleanup 2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a chore: fetch logic for payment entry 2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185 chore: move functions to a separate file in utils 2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad chore: move dialog building function to utils.js file 2023-09-05 08:34:26 +05:30
ruthra kumar
58dc0e52e1 refactor: add UI elements 2023-09-05 08:34:26 +05:30
ruthra kumar
6bbe47c671 chore: delete unreoncile doc upon parent doc deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
489a545bbb chore: track changes 2023-09-05 08:34:26 +05:30
ruthra kumar
42df0d3d67 refactor: remove references using framework 2023-09-05 08:34:26 +05:30
ruthra kumar
fbdfb8151c chore: delete references upon parent deletion 2023-09-05 08:34:26 +05:30
ruthra kumar
41eb2c9f5a feat: filter on voucher no 2023-09-05 08:34:26 +05:30
ruthra kumar
fc6be5bfb9 feat: UI for unreconcile 2023-09-05 08:34:26 +05:30
ruthra kumar
0faffaa8db test: basic unreconcile function 2023-09-05 08:34:26 +05:30
ruthra kumar
5114a9580d refactor: adding 'Get Allocations' button 2023-09-05 08:34:26 +05:30
ruthra kumar
e48a90efe6 chore: working state on barebones functions 2023-09-05 08:34:26 +05:30
ruthra kumar
dc71623295 feat: introduce unreconcile doctype 2023-09-05 08:34:26 +05:30
ruthra kumar
f7865da4d2 refactor: gain/loss should use same posting date as payment 2023-09-04 21:40:40 +05:30
rohitwaghchaure
6a7bdeffdf
fix: auto refresh serial and batch bundle field (#36943) 2023-09-04 14:11:42 +05:30
ruthra kumar
04bc353e7f
Merge pull request #36940 from ruthra-kumar/invalid_gain_loss_in_expense_claim 
fix: invalid gain/loss JE created on base currency Expense Claim
 2023-09-04 13:56:01 +05:30
ruthra kumar
75d95acb23 fix: invalid gain/loss JE created on base currency Expense Claim 2023-09-04 13:05:57 +05:30
s-aga-r
cd8ddae7c5
refactor: remove Recalculate Rate from SCR Item (#36929) 2023-09-03 18:54:44 +05:30
s-aga-r
22cf1556cd
feat: Service Item and Finished Good Map (#36647) 
* feat: new DocType `Service Item and Finished Good Map`

* fix(ux): filters for Service Item and Finished Good

* fix: validations for Service Item and Finished Good

* feat: set FG Item on Service Item selection in PO

* refactor: one-to-many mapping between service item and finished goods

* feat: auto set Service Item for finished good in PO created from PP

* feat: auto set Service Item on Finished Good selection in PO

* test: add test case for service item and finished goods map

* feat: `BOM` field in `Finished Good Detail`

* feat: new DocType `Subcontracting BOM`

* fix: filters and validations for Subcontracting BOM

* feat: auto select Service Item in PO created from PP

* test: add test case for PO service item auto pick

* feat: pick BOM from Subcontracting BOM in SCO

* feat: auto pick `Service Item` on FG select

* refactor: remove DocType `Service Item and Finished Goods Map` and `Finished Good Detail`

* feat: fetch FG for Service Item

* chore: `linter`

* refactor: update `Auto Name` expression for Subcontracting BOM
 2023-09-03 11:59:28 +00:00
HENRY Florian
24e1144de5
fix: when create doc from item dashboard default uom (buying or selling) is not correctly selected (#36892) 
fix: when create doc from item dashboard defaut uom is not correctly selected
 2023-09-03 16:37:52 +05:30
ruthra kumar
27e0dd9fdc
Merge pull request #36911 from ruthra-kumar/deduplicate_gain_loss_journal_creation 
fix: deduplicate gain/loss JE creation for journals as payment
 2023-09-03 10:11:43 +05:30
ruthra kumar
0366928db5 test: cost center inheritance from payment 2023-09-03 09:21:26 +05:30
ruthra kumar
d6a3b9a5c7 refactor: use payment's CC for gain/loss if company default is unset 2023-09-03 09:21:23 +05:30
Anand Baburajan
4f0bb45a8b
chore: patch to correct asset values if je has workflow [dev] (#36914) 
chore: patch to correct asset values if je has workflow
 2023-09-02 18:31:32 +05:30
Deepesh Garg
2e7548462d
Merge pull request #36895 from blaggacao/fix-coa-dill-down-on-startup 
fix(startup): coa drill down
 2023-09-02 17:12:18 +05:30