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

42717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
96f46b220b
Merge branch 'develop' into fixed-time-out-error-reposting 2022-07-05 19:23:46 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india 
refactor: remove India specific code
 2022-07-05 18:50:41 +05:30
Rohit Waghchaure
78c8bb251e fix: timeout error while reposting 2022-07-05 18:45:13 +05:30
rohitwaghchaure
8835d16b60
Merge pull request #31514 from ruthra-kumar/fix_test_for_pr_tool 
fix: test pr output for amount and currency
 2022-07-05 18:35:01 +05:30
rohitwaghchaure
c2432778ef
Merge branch 'develop' into fix_test_for_pr_tool 2022-07-05 17:18:50 +05:30
rohitwaghchaure
d5b0b5e798
Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials 
fix: test case
 2022-07-05 15:10:59 +05:30
Rohit Waghchaure
7282c8e65b fix: test case 2022-07-05 15:10:28 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting 2022-07-05 11:25:08 +05:30
Ankush Menat
90942d2ba5
chore: remove currency info from boot (#31520) 
refactor: remove currency info from boot

Framework loads this info by default now, so no need to add it here.
 2022-07-05 11:22:32 +05:30
Sagar Sharma
a7161d3875 fix: SCO status on SCR cancel 2022-07-05 09:27:56 +05:30
Sagar Sharma
6f7e67db9d chore: hide "Duplicate" button in PO 2022-07-05 08:44:35 +05:30
Sagar Sharma
687329f571 chore: update fg_item_qty based on qty in PO Item 2022-07-05 08:31:31 +05:30
Deepesh Garg
d5da8c7403
Merge pull request #31516 from deepeshgarg007/previsional_accounting_report 
fix: Incorrect provisional expense booking while reposting
 2022-07-04 20:28:10 +05:30
Deepesh Garg
60aad31162 fix: Incorrect provisional expense booking while reposting 2022-07-04 18:38:26 +05:30
ruthra kumar
104c45ecc4 fix: test pr output for amount and currency 2022-07-04 18:04:29 +05:30
marination
7a5fd71a6c fix: LCV updates wrong future qty/Bin qty 
- As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated
- This just doubly shifts all future qty which is then fixed by a repost
- Until the repost balance values are wrong
- Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin
 2022-07-04 17:46:54 +05:30
hrzzz
8cd3eb5286 fix: translation / linters 2022-07-04 08:02:02 -03:00
Rucha Mahabal
694d35e1c4 fix: Add Designation fixtures 2022-07-04 16:17:26 +05:30
Rucha Mahabal
2da427c023 patch: do not run deletion patch if HRMS is already installed 2022-07-04 14:54:23 +05:30
Ankush Menat
42761a315a chore: ignore late binding warnings 
Most are false positives

[skip ci]
 2022-07-04 13:19:18 +05:30
Marica
75fc4ee938
Merge branch 'develop' into make-image-field-obsolete-in-web-item 2022-07-04 13:14:12 +05:30
Deepesh Garg
ac9d38aa1c
Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool 
fix: Use account currency on Payment Reconciliation tool
 2022-07-03 19:20:29 +05:30
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
Deepesh Garg
4038c42922
Merge pull request #31405 from deepeshgarg007/e_invoice_discounts 
feat: Cash and Non trade discounts in Sales Invoice
 2022-07-03 13:34:38 +05:30
Deepesh Garg
b168d2fc25 Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts 2022-07-03 11:02:32 +05:30
Deepesh Garg
e54ec4b9b6 chore: use get instead of . operator 2022-07-03 11:02:21 +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
Deepesh Garg
38352b3e46 test: Add test for einvoice discounts 2022-07-02 22:27:20 +05:30
Deepesh Garg
b4f6429e32 Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts 2022-07-02 18:42:31 +05:30
Sagar Sharma
caeaa3f940 fix: multiple SCO against a PO 2022-07-02 06:20:09 +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
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation 
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
 2022-07-01 19:01:17 +05:30
Sagar Sharma
fd162f9b14 fix: supplier warehouse in PR 2022-07-01 16:51:19 +05:30
ruthra kumar
c9d67defd8 test: PR output should have account currency 2022-07-01 13:02:14 +05:30
ruthra kumar
219855311d fix: wrong amount fetched in payment reconciliation tool 
- fetch amount on account currency for outstanding invoices and
- unreconcilied dr/cr notes
- fix currency field name in payment ledger entry creation
 2022-07-01 12:47:07 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Rucha Mahabal
a1a6810b58 fix: Remove HR & Payroll from Authorization Control and Rules 2022-07-01 11:28:34 +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
Rucha Mahabal
7442a886a6 test: fix Employee and Activation test 2022-07-01 10:34:32 +05:30
hrzzz
fbb71a2611 fix: translated message for credit limit blocking 2022-06-30 16:14:51 -03:00
Rucha Mahabal
3051f6e7f2 fix: Update triggers on Payment Reconciliation 2022-06-30 21:37:55 +05:30
Deepesh Garg
536e768ba9 fix: Internal PI link in Sales Invoice 2022-06-30 21:29:54 +05:30
Rucha Mahabal
9f7511d6bf fix: Remove HR & Payroll Settings from Company master 
- moved setup to HRMS app
 2022-06-30 18:12:12 +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
Sagar Sharma
b86710bb9a fix(ui): hide "Update Items" button based on subcontracting conditions 2022-06-30 17:28:42 +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
Sagar Sharma
8e4458e0e6 fix: failing test 
Removed this test case as the new POs will not have the Supplied Items table.
 2022-06-30 16:47:43 +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