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

46626 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vr-greycube
4ada5a488e
fix: Use default Cost Center of the Company for additional discount (#37234) 
fix: Set cost center as default company cost center 

When Discount Accounting in enabled in Selling Settings, use Company default Cost Center while making GL entries for additional_discount_account
 2023-09-27 10:38:32 +05:30
Deepesh Garg
8c5fcb8257
fix: PCV posting issues (#37029) 
* fix: PCV posting issues

* fix: process closing entries separately in a background job

* test: Update tests

* chore: fix broken ci
 2023-09-27 10:22:09 +05:30
ruthra kumar
a223935f14
Merge pull request #37248 from GursheenK/ar-summary-party-filter 
fix: AP & AR summary filters to match AR
 2023-09-27 09:41:01 +05:30
Ankush Menat
4555543920
Merge pull request #37249 from akhilnarang/drop-redundant-check 
Drop redundant check
 2023-09-26 21:54:36 +05:30
HENRY Florian
8051c2d3cb
refactor: In Quotation Item, discount_and_margin section should have same collapsible_depends_on as other similar DocType (Sales Order Item,Sales Invoice Item,...) (#37252) 2023-09-26 18:59:27 +05:30
mergify[bot]
2cca37ad7d
fix: reserved qty for production plan (backport #37251) (#37253) 
fix: reserved qty for production plan (#37251)

(cherry picked from commit 0a0d5b3e6612be1b6e1c9febd4a86a772a02511d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-26 18:29:54 +05:30
mergify[bot]
d558ba29fa
fix: serial number decimal issue (backport #37242) (#37250) 
fix: serial number decimal issue (#37242)

(cherry picked from commit 78ab2013e59bb6a95d10164328ad3f7c815497b5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-26 17:55:16 +05:30
ruthra kumar
796cc0915a
Merge pull request #37194 from GursheenK/editable-purchase-invoice 
feat: editable purchase invoice
 2023-09-26 16:46:11 +05:30
Gursheen Anand
76a5d94f37 fix: set new AP summary filters 2023-09-26 15:11:54 +05:30
Gursheen Anand
7d96044d8e fix: change filters for AR summary 2023-09-26 15:10:16 +05:30
Gursheen Anand
832d7e7d7b fix: set AR filters after rename 2023-09-26 15:08:40 +05:30
ruthra kumar
ed7f67b1a8 refactor: remove references in repost doctypes upon parent doc delet 2023-09-26 14:35:31 +05:30
Deepesh Garg
656c758263
chore: Add missing comma 2023-09-26 14:20:41 +05:30
Akhil Narang
dd911aa521
chore(stock_ledger): drop redundant check 
Commit c2d7461d3c dropped a usage of
`last_valuation_rate` around this code block. After that, it was always checked
although the value would be None as it was being explicitly set above.

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
 2023-09-26 14:07:01 +05:30
s-aga-r
73fc974950
fix: incorrect Parent Task getting set for 2nd to nth child Task (#37230) 2023-09-26 10:54:23 +05:30
Abraham Kalungi
0f6b530032
feat: Added ledger for Botswana VAT (#37212) 
feat: Added ledger for Botswana VAT (#37212)
 2023-09-26 08:57:50 +05:30
NIYAZ RAZAK
5e4b73918d
fix: set route to cost center 
cost center mapping is not correct
 2023-09-25 22:15:08 +03:00
Deepesh Garg
a444906093
Merge pull request #37191 from FHenry/dev_fr_translation 
fix: missing french translation on Lead and Prospect
 2023-09-25 18:24:16 +05:30
Florian HENRY
7657b721bc Merge branch 'develop' of https://github.com/frappe/erpnext into dev_remove_regional_france 2023-09-25 10:27:22 +02:00
Anand Baburajan
ee178ff2ce
chore: add disabled field for bank account (#37226) 2023-09-25 12:12:11 +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
61c6ebbb95 fix: validation for si 2023-09-23 20:30:50 +05:30
Gursheen Anand
8ef0d88708 fix: call validate before setting repost flag 2023-09-23 20:29:38 +05:30
Gursheen Anand
1856050ef9 fix: do not run bg job for single doc 2023-09-23 19:30:42 +05:30
Gursheen Anand
a856091ff4 refactor: remove repeated validation for voucher 2023-09-23 19:18:06 +05:30
Gursheen Anand
7ebf083683 refactor: use repost accounting legder 2023-09-23 19:13:33 +05:30
Gursheen Anand
ba7212c98b refactor: remove unused method 2023-09-23 19:11:46 +05:30
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
Florian HENRY
f15603017c refactor: missing translation 2023-09-22 16:56:12 +02:00
Florian HENRY
b2d520647f refactor: missing translation 2023-09-22 16:55:58 +02:00
Florian HENRY
d1c69aa229 Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fr_translation 2023-09-22 16:53:13 +02:00
Florian HENRY
dc1294ec54 refactor: missing translation 2023-09-22 16:53:06 +02:00
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
Gursheen Anand
c66c438575 test: reposted acc entries for pi 2023-09-22 11:22:25 +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