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

46549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
ff0343d2cc fix: auto separate against accounts 2023-11-06 16:46:43 +05:30
Gursheen Anand
3d00d74fed fix: combine jv entries for rate revaluation 2023-11-06 16:45:56 +05:30
Gursheen Anand
35d92abe73 fix: remove multiple against account values from gle 2023-10-11 15:56:59 +05:30
Gursheen Anand
28445058ef fix: split exchange gain loss account entries 2023-10-11 15:56:13 +05:30
Gursheen Anand
aab5737ff3 fix: make JV account against field a dynamic link 2023-10-11 15:55:02 +05:30
Gursheen Anand
952e8cf60c fix: asset capitalization tests 2023-10-03 15:55:34 +05:30
Gursheen Anand
fcfdb9b566 fix: purchase receipt tests 2023-10-03 15:19:33 +05:30
Gursheen Anand
f705bf2efe fix: remove multiple accounts from against in capitalization 2023-09-25 20:10:01 +05:30
Gursheen Anand
6e1565c32c fix: set against type in asset 2023-09-25 20:08:42 +05:30
Gursheen Anand
4ea43ebc5d fix: set against type in stock controller 2023-09-25 20:01:13 +05:30
Gursheen Anand
f292a0cc4c fix: set against type in utils 2023-09-25 19:58:12 +05:30
Gursheen Anand
4c5a83d6cf fix: set against type in controllers 2023-09-25 19:55:40 +05:30
Gursheen Anand
82774f89b1 fix: set against type in deferred revenue 2023-09-25 19:50:47 +05:30
Gursheen Anand
19b220f39c fix: set against type in inv gl dict 2023-09-25 19:49:17 +05:30
Gursheen Anand
725a7f90e9 fix: use dynamic link for against field 2023-09-25 19:45:19 +05:30
Deepesh Garg
c7969b428d
Merge pull request #37116 from blaggacao/fix/payment-url 
fix: payment url display as link
 2023-09-24 21:50:53 +05:30
Deepesh Garg
12e16aa95f
Merge pull request #37190 from FHenry/dev_feat_adress_contact_postion 
feat: Customer and Supplier - Primary Address and Contact on the same column as new address and contact
 2023-09-24 21:39:05 +05:30
Raffael Meyer
7c4ebe2733
fix(Material Request): consider project for item details (#37215) 
fix(Material Request): project in item details
 2023-09-24 21:10:53 +05:30
Deepesh Garg
b8ff9e8166
Merge pull request #37214 from barredterra/german-purchase-receipt 
fix!: german translation of Purchase Receipt
 2023-09-24 20:20:11 +05:30
Deepesh Garg
08566204dc
Merge pull request #37219 from frappe/mergify/bp/develop/pr-37167 
fix: set customer currency in pos_invoice if exists (#37167)
 2023-09-24 20:18:27 +05:30
milanpethani
62ea097b14 fix: set customer currency in pos_invoice if exists 
if currency exists in the profile and customer currency doesn't exists still it will update currency to None, so update customer currency only if exists

(cherry picked from commit 041d52e82880610a99903ecf4c459e98bd1fff76)
 2023-09-24 12:23:58 +00:00
Deepesh Garg
9dbb9e7515
Merge pull request #37211 from deepeshgarg007/trial_balance_net_values 
feat: Toggle net values in Trial Balance report
 2023-09-24 17:45:11 +05:30
Deepesh Garg
b578317f03
Merge pull request #37213 from GursheenK/process-soa-gl-filters 
fix: filter gl entries in process soa
 2023-09-24 17:44:21 +05:30
barredterra
7f98100040 fix: german translation of Purchase Receipt 2023-09-23 20:54:13 +02:00
Gursheen Anand
5346c67b02 fix: apply gl report filters 2023-09-23 17:50:45 +05:30
Deepesh Garg
06a45897de feat: Toggle net values in Trial Balance report 2023-09-23 14:34:11 +05:30
ruthra kumar
c5e4e01747
Merge pull request #37202 from ruthra-kumar/ignore_ple_on_pcv_cancellation 
refactor: ignore PLE's on PCV cancellation
 2023-09-22 13:28:40 +05:30
ruthra kumar
301092dad1 refactor: ignore PLE's on PCV cancellation 2023-09-22 12:40:51 +05:30
ruthra kumar
5353f190ee
Merge pull request #37200 from ruthra-kumar/ui_element_to_filter_on_payment_entry_exc_gain_loss 
refactor: button in Payment Entry to filter associated Journals
 2023-09-22 11:54:02 +05:30
ruthra kumar
150728deaa refactor: button on PE to filter associated Journals 2023-09-22 11:30:47 +05:30
ruthra kumar
d4773872aa
Merge pull request #37069 from marination/advance-unlink-impact 
fix: Recalculate `advance_paid` in SO/PO after unlinking from advance entry
 2023-09-22 08:35:27 +05:30
s-aga-r
c679d54852
Merge pull request #37185 from s-aga-r/REFACTOR-SRE 
refactor(minor): Stock Reservation Entry
 2023-09-21 21:46:09 +05:30
s-aga-r
b6437e387f fix: Item Dashboard 2023-09-21 18:23:20 +05:30
s-aga-r
8b6430c886 refactor(minor): Stock Reservation Entry 2023-09-21 18:23:18 +05:30
Florian HENRY
fb844920af feat: Customer and Supplier - Primary Address and Contact on the same column as new adress and contact 2023-09-21 12:28:09 +02:00
ruthra kumar
f31a527505
Merge pull request #37120 from vorasmit/fix-dup-advance 
fix: handle multiple references with same name
 2023-09-21 14:20:04 +05:30
s-aga-r
acda72d616
feat: Stock Ledger Variance report (#37165) 
* feat: `Stock Ledger Variance` report

* refactor: `get_data()`
 2023-09-21 12:51:28 +05:30
s-aga-r
f0859ecc60
fix: labels for Stock Ledger Invariant Check report (#37150) 
refactor: `Stock Ledger Invariant Check` report
 2023-09-20 18:36:24 +05:30
rohitwaghchaure
dd4769ecf1
feat: allow to edit Stock Quantity in the Sales and Purchase Transactions (#36600) 
feat: allow to edit Stock Quantity in the Sales and Purchase transactions
 2023-09-20 18:09:03 +05:30
rohitwaghchaure
e6199dc802
fix: allow to select parent warehouse in the website item (#37047) 2023-09-20 17:27:35 +05:30
Ankush Menat
bf01f3227f chore: remove import script 
Unused
 2023-09-20 16:22:49 +05:30
Smit Vora
3e282bfbce
chore: add regional support for getting payment entries (#37119) 
chore: add regional support for get payment entries
 2023-09-19 20:47:21 +05:30
RJPvT
c35dea7177
chore: translations dutch (#37042) 
update: translations dutch
 2023-09-19 20:26:42 +05:30
Raffael Meyer
57d5c8a837
fix: update help links (#37098) 2023-09-19 19:59:16 +05:30
Raffael Meyer
84a9000db2
fix: german translation of Sales and Purchase Invoice (#37122) 
* fix: german translation of Purchase Invoice

* fix: german translation of Sales Invoice
 2023-09-19 19:57:43 +05:30
NandhiniDevi
6be567dbf6
fix: add item group filter added in item-wise purchase register (#36937) 
fix: add item group filter added in item-wise purchase register (#36937)
 2023-09-19 19:25:46 +05:30
NIYAZ RAZAK
141ba255e0
feat: validate duplicate date in holiday list (#37022) 
* feat: validate duplicate date in table

* chore: cleanup

* chore: linting issues

* chore: linting issues

---------

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-09-19 18:50:47 +05:30
Deepesh Garg
e19e04b050
feat: Add a process document for Subscription (#37126) 
* feat: Add a process document for Subscription

* chore: Remove print statements

* feat: Input for generating invoice before currenc invoice date

* chore: patch for backward compatability

* refactor: Unit tests for subscription

* chore: set status on insert
 2023-09-19 18:39:44 +05:30
RitvikSardana
03f0abf6de
fix: after applying coupon code, field in_words not updated (#37133) 
* fix: after applying coupon code, field in_words not updated

* fix: changed the order of the function set_total_in_words
 2023-09-19 13:08:17 +05:30
s-aga-r
9c9d0ecb73
feat: provision to create RIV from Stock Ledger Invariant Check report (#37115) 
* feat: provision to create RIV from `Stock Ledger Invariant Check` report

* fix: `linter`
 2023-09-19 13:00:44 +05:30