Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,333 Commits 3 Branches 0 Tags 1 GiB
60aad31162
Commit Graph

42333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
60aad31162 fix: Incorrect provisional expense booking while reposting 2022-07-04 18:38:26 +05:30
Deepesh Garg
6bb203d1f5
Merge pull request #31410 from alyf-de/apply-price-list 
fix: apply price list rate
 2022-07-02 22:47:55 +05:30
Deepesh Garg
a4edcfe33b
Merge pull request #31493 from deepeshgarg007/internal_invoicing_references 
fix: Internal PI link in Sales Invoice
 2022-07-02 22:47:10 +05:30
Ankush Menat
7e40c86c56
fix(UX): dont apply price list when changing batch on mapped docs (#31503) 
fix(UX): dont apply price list batch change on mapped docs
 2022-07-01 20:08:16 +05:30
mergify[bot]
7b093e5803
fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days (backport #31425) (#31432) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-01 10:35:59 +05:30
Deepesh Garg
536e768ba9 fix: Internal PI link in Sales Invoice 2022-06-30 21:29:54 +05:30
Ankush Menat
7a02dfe09a
Merge pull request #31491 from ankush/update_310 
build!: bump min python required to 3.10
 2022-06-30 17:41:43 +05:30
Ankush Menat
b9f394a794 ci: patch test w/ diff python versions 
Co-Authored-By: Gavin D'souza <gavin18d@gmail.com>
 2022-06-30 17:10:08 +05:30
Deepesh Garg
7ea29d870e
Merge pull request #31487 from dj12djdjs/fix-company-default-root-type 
fix: gain/loss can be income or expense
 2022-06-30 16:45:08 +05:30
Ankush Menat
57d08b7cdf build!: bump min python required to 3.10 2022-06-30 15:49:43 +05:30
Ankush Menat
a51513194e
Merge pull request #31475 from ankush/meta_update 
build!: declarative builds
 2022-06-30 12:02:04 +05:30
Ankush Menat
cd0450b102 refactor: move dev-dependencies to pyproject 2022-06-30 11:43:00 +05:30
Ankush Menat
0e3872aceb chore(meta): update CODEOWNERS 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2022-06-30 11:43:00 +05:30
Ankush Menat
20f85195f4 build!: declarative builds 2022-06-30 11:42:59 +05:30
Ankush Menat
56c6a709cd
ci: bump container count for unittests (#31490) 
[skip ci]
 2022-06-30 11:35:45 +05:30
Devin Slauenwhite
8a13ddc2f2
fix: gain/loss can be income or expense 2022-06-29 12:28:24 -04:00
gn306029
2a619fd789
fix: Modify opts parameter misspell (#31476) 
Modify opts parameter misspell 

closes #31474
 2022-06-29 14:45:21 +05:30
Devin Slauenwhite
cdf631b9de
fix: validate item dashboard material transfer entry (#31473) 2022-06-29 12:06:47 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note 
fix: 'attribute error' on AR/AP report with delivery note filter
 2022-06-29 08:06:34 +05:30
Ankush Menat
080fcb91f2 ci: pin semgrep to old version 
current version has problem with PRs originating from fork
 2022-06-28 13:46:12 +05:30
Ankush Menat
5d73697c64
fix: offset some scheduled jobs to avoid locks (#31466) 
If your site has multiple background workers then there's possibility
that two jobs will execute in parallal, this creates problem when both
are on operating on same data.

This PR adds a separate section for hourly and daily jobs which have
frequency offset from default frequency to avoid such conflicts.
 2022-06-28 12:22:17 +05:30
Ankush Menat
bedb11ee67 fix: youtube stats background sync failures 2022-06-28 10:50:44 +05:30
Nabin Hait
925b9d985e fix: open lead and opportunities based on today's event 2022-06-27 22:13:09 +05:30
Nabin Hait
7921a1a605 fix: Restored city, state and country fields 2022-06-27 22:13:09 +05:30
ruthra kumar
3cd34ebab6 fix: 'attribute error' on AR/AP report with delivery note filter 2022-06-27 17:29:25 +05:30
Ankush Menat
dd11f26eba
fix: dont update RM items table if not required (#31408) 
Currently on PO update RM item table is auto computed again and again,
if there was any transfer/consumption against that then it will be lost.

This change:
1. Disables updating RM table if no change in qty of FG was made. Since
   RM table can't possibly be different with same FG qty.
2. Blocks update completely if qty is changed and RM items are already
   transferred.
 2022-06-27 15:55:08 +05:30
Ankush Menat
20dac08f5f
refactor: clean up product bundle client side code (#31455) 
refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema
 2022-06-27 15:54:54 +05:30
Deepesh Garg
173588e169
Merge pull request #31446 from deepeshgarg007/quotation_order_item_syn 
fix: Quotation and Sales Order item sync
 2022-06-27 11:17:48 +05:30
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn 2022-06-25 19:46:20 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers 
fix: incorrect outstanding for invoice
 2022-06-25 19:42:14 +05:30
Nabin Hait
f72d5506de fix: get_all replace by sql 2022-06-25 15:08:45 +05:30
Nabin Hait
2d226be3c4 fix: Made no of employees a select field 2022-06-25 11:40:23 +05:30
Nabin Hait
483fc420a1 test: invoice from timesheet 2022-06-25 11:40:23 +05:30
Nabin Hait
6a0d0a338d fix: Test cases removed related to copying comments from opportunity to quotation 2022-06-25 11:40:23 +05:30
Nabin Hait
82bf59e2a3 fix: test case 2022-06-25 11:40:23 +05:30
Nabin Hait
d8163f3e47 fix: set exchange rate 2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Deepesh Garg
6acd0325be fix: General Ledger and TB opening entries mismatch issues 2022-06-24 21:45:05 +05:30
Deepesh Garg
58fe220479 fix: Quotation and Sales Order item sync 2022-06-24 19:43:50 +05:30
ruthra kumar
321fea322c test: invoice outstanding when gl's are split on cost center allocat 2022-06-24 17:47:11 +05:30
ruthra kumar
71f6f78d94 fix: incorrect outstanding for invoice 2022-06-24 13:36:15 +05:30
Marica
1d683ca9f2
Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty 
fix: add UOM validation for planned-qty
 2022-06-24 12:40:03 +05:30
GangaManoj
416d578290 fix: Add missing comma 2022-06-23 15:14:31 +05:30
GangaManoj
1b1786532a test: Test monthly depreciation by Written Down Value method 2022-06-23 15:14:31 +05:30
GangaManoj
2b7ab72a72 fix: Convert string to datetime object 2022-06-23 15:14:31 +05:30
GangaManoj
e62beaefc1 test: Test if final day of the month is taken if depr_start_date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
154e258ad0 fix: Get last day of the monthif depr posting date is the last day of its month 2022-06-23 15:14:31 +05:30
GangaManoj
b07aae4da5 fix: Correct pro-rata amount calculation 2022-06-23 15:14:31 +05:30
GangaManoj
2d9153ea30 fix: Remove misleading comment 2022-06-23 15:14:31 +05:30
GangaManoj
ab13a178b5 fix: Replace asset life with total no of depreciations 2022-06-23 15:14:31 +05:30