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

46719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
fb51cae88b chore: fix shopping cart tests 2023-10-02 16:16:31 +05:30
Deepesh Garg
3c1f93215a
Merge pull request #37297 from frappe/mergify/bp/develop/pr-37293 
fix: Description field for the 'Ignore Available Stock' (backport #37293)
 2023-10-02 10:56:33 +05:30
Deepesh Garg
964cd75f6e
Merge pull request #37235 from niyazrazak/patch-13 
fix: set route options to cost center
 2023-10-02 10:54:02 +05:30
Deepesh Garg
559466e1ef
Merge pull request #37229 from FHenry/dev_remove_regional_france 
refactor!: Remove Regionalisation of France as now there is an App ERPNext France to manage it
 2023-10-02 10:51:25 +05:30
s-aga-r
e7f4b7b190
fix: ignore user permissions for Source Warehouse (#37313) 2023-10-01 21:25:01 +05:30
David Arnold
d3f94a03fc
fix(stock): add delivery user and manager role 2023-10-01 15:13:54 +02:00
Deepesh Garg
25718f5cc7 chore: rewrite query using query builder 2023-10-01 13:27:44 +05:30
Gursheen Anand
1dab195560 fix: add only float row values for total 2023-09-29 18:20:02 +05:30
s-aga-r
361e555118
fix: Not unique table/alias: 'tabTask' (#37285) 2023-09-29 15:05:02 +05:30
rohitwaghchaure
36364c235e fix: Description field for the 'Ignore Available Stock' (#37293) 
(cherry picked from commit 7f1483ad707feac6413994400217413e5c167c7b)
 2023-09-29 09:06:47 +00:00
Gursheen Anand
644e25e587 test: process soa for gl and ar 2023-09-29 14:35:43 +05:30
Gursheen Anand
67f878ff8c refactor: separate function for statement dict 2023-09-29 14:34:43 +05:30
ruthra kumar
d391e81505 refactor: block Payment Entry as ref in JE from UI 2023-09-29 13:40:59 +05:30
Gursheen Anand
d9eb44e62d fix: ageing summary in AR 2023-09-29 11:12:19 +05:30
ruthra kumar
f160e49483
Merge pull request #37268 from GursheenK/ar-summary-party-filter 
fix: AP AR filters from Party link
 2023-09-28 11:54:34 +05:30
ruthra kumar
2c7d6aec89 test: multi select party filter in AR report 2023-09-28 11:17:38 +05:30
mergify[bot]
f375c8cc7f
fix: incorrect qty for material request in Production Plan (backport #37270) (#37275) 
fix: incorrect qty for material request in Production Plan (#37270)

(cherry picked from commit 8fe4a4d3aa7857e5e241bcb7145065753ab8b4cb)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-09-27 23:35:53 +05:30
Marica
d6e4f80187
fix: Set serial_and_batch_bundle in right field for Asset Repair Stock Entry (#37273) 
fix: Set `serial_and_batch_bundle` in same field for Asset Repair SE
- `serial_and_batch_bundle` was earlier set in `serial_no` field
 2023-09-27 23:34:57 +05:30
s-aga-r
296b233659 chore: patch to delete Payment Gateways 2023-09-27 15:27:29 +05:30
Gursheen Anand
59e8abfd57 fix: party format in test 2023-09-27 13:57:49 +05:30
Gursheen Anand
4b28154f5e fix: process soa filter for multiselect 2023-09-27 13:04:13 +05:30
Gursheen Anand
f7cb68a45f fix: summary report filters 2023-09-27 13:03:37 +05:30
Gursheen Anand
e7239e02d4 fix: query for multiselect filter 2023-09-27 13:02:52 +05:30
Gursheen Anand
9d15124a6a fix: set route filter values for AR 2023-09-27 13:01:48 +05:30
Gursheen Anand
888ed36eed fix: set route filter values for AP 2023-09-27 13:01:18 +05:30
Ankush Menat
2dc95e5d59
fix: trial balance report freezes when adding filters (#37264) 
fix: Only add onclick if correct data is returned

workaround for https://github.com/frappe/datatable/issues/177
 2023-09-27 12:34:40 +05:30
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
s-aga-r
b1770b3f86 refactor: remove test test_default_bank_account 2023-09-26 15:10:20 +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 c2d7461d3cac639778e7740c4b08e459332a6b14 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
s-aga-r
38aebf65e2 refactor!: remove stripe_integration.py 2023-09-25 11:08:24 +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