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

32581 Commits

Author SHA1 Message Date
rohitwaghchaure
8eb676eb5a
Merge pull request #31519 from rohitwaghchaure/fixed-time-out-error-reposting 
fix: timeout error while reposting
 2022-07-06 11:45:02 +05:30
Marica
9b6bb1b3fc
Merge pull request #31529 from marination/petty-purchase 
fix: Use fallback conversion factor while setting incoming rate for petty purchase
 2022-07-06 00:38:37 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt 2022-07-05 21:19:50 +05:30
marination
aa043fe961 fix: Use fallback conversion factor while setting incoming rate for petty purchase 
- PIs for petty items (that do not need an Item record) are allowed using Item Name field
- If a different UOM is used in this case, conversion factor stays 0 and causes an error
- Fallback to 1 in `set_incoming_rate` for buying
- Selling will need a proper item, so this change is not needed there
 2022-07-05 19:43:02 +05:30
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
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
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
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
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
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
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
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
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
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
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
Sagar Vora
0aafc75c90 fix: add missing print format 2022-06-26 18:36:00 +05:30
Sagar Vora
85c4c342d8 fix: improve patches 2022-06-26 18:30:54 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Smit Vora
64de0d06ad patch: remove custom field creation patch 2022-06-26 11:56:06 +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