marination
9f2d325e67
fix: Pick Template BOM if variant BOM absent in WO popup from SO
...
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked
2022-06-14 17:20:44 +05:30
Deepesh Garg
d05d15346a
fix: Conversion rate validation for multi-currency invoices
2022-06-14 12:50:49 +05:30
Deepesh Garg
f8011f30e0
Merge pull request #31322 from deepeshgarg007/quotation_issues
...
fix: Company address filter in quotation
2022-06-14 11:17:12 +05:30
Deepesh Garg
5b2ba087a3
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-14 10:50:47 +05:30
Deepesh Garg
fb3da124e5
chore: linting issues
2022-06-14 10:50:38 +05:30
Conor
00ef499739
refactor: use db independent offset syntax ( #31345 )
...
* chore: use db independent offset syntax
* fix: typo
* style: reformat code to black spec
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-06-14 10:49:07 +05:30
Marica
39338e70d5
Merge pull request #31341 from marination/subcontract-supplied-items
...
fix: Supplied Qty not updated on Stock Entry cancel
2022-06-13 20:43:01 +05:30
Marica
f5ebaed191
Merge branch 'develop' into subcontract-supplied-items
2022-06-13 18:32:43 +05:30
marination
b8f468cb4f
test: PO Supplied Qty reset on cancel/submit
2022-06-13 18:31:35 +05:30
marination
fa1d9d548e
fix: Supplied Qty not updated on Stock Entry cancel
...
- Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel
- Use DB API insteaf of raw SQL
2022-06-13 17:59:03 +05:30
Ankush Menat
883598d59a
chore: delete BOT
...
RIP
2022-06-13 16:24:48 +05:30
Ankush Menat
697fbe946a
Merge pull request #31337 from gavindsouza/get_fiscal_years-refactor
...
refactor: get_fiscal_years API
2022-06-13 14:56:33 +05:30
Gavin D'souza
e9af68e947
test: Remove deprecated as_tuple kwarg in FrappeTestAPI.post
2022-06-13 14:26:59 +05:30
Gavin D'souza
6c726a161c
ci(patch): Setup python dependencies after switching to current branch
2022-06-13 13:22:04 +05:30
Deepesh Garg
b12b7b51ec
Merge pull request #31107 from ruthra-kumar/refactor_ar/ap_report
...
refactor: Accounts Receivable/Payable Report will use Payment Ledger
2022-06-13 12:57:25 +05:30
Gavin D'souza
5f8cd34da5
fix: Use newer PyPDF2 APIs
...
Depends on https://github.com/frappe/frappe/pull/17127
2022-06-13 12:43:08 +05:30
Gavin D'souza
0727d1d99b
refactor: get_fiscal_years API
...
* Optimize fiscal year options generation
* Don't pass unrequired criterions / values to prepared query
* Use QB notation for raw query
2022-06-13 12:43:08 +05:30
Deepesh Garg
ea276a7b86
Merge branch 'develop' into refactor_ar/ap_report
2022-06-13 12:34:47 +05:30
Ankush Menat
3701cdbaf1
ci(Mergify): configuration update ( #31336 )
...
Signed-off-by: Ankush Menat <ankushmenat@gmail.com>
2022-06-13 12:14:31 +05:30
Marica
d3d0ade89f
chore: Accidental '=' instead of comma in French translation ( #31335 )
2022-06-13 11:54:12 +05:30
HENRY Florian
83367bfe5e
fix: update fr translation ( #31232 )
...
* update fr translation
* fix:update fr translation
* fix:update fr translation
* fix:update fr translation
* fix:update fr translation
* fix:update fr translation
* fix:update fr translation
* fix:update fr translation
* Update fr.csv
update typo
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* update fr translation
* fix: Use elision instead of HTML code equivalent
* fix: Use elision instead of HTML code equivalent (pt 2)
* fix: Use elision/single quote instead of HTML code equivalent (pt 3)
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-06-13 11:15:47 +05:30
ruthra kumar
3018756482
refactor: remove 'show remarks'
2022-06-13 10:56:33 +05:30
ruthra kumar
71521b6550
refactor: unit test for AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
cd9d70d6ee
refactor: show advance payments in AR/AP report
2022-06-13 10:56:33 +05:30
ruthra kumar
dfe3082596
refactor: AR/AP will use payment ledger
2022-06-13 10:56:30 +05:30
Deepesh Garg
eb93564db6
Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues
2022-06-11 21:56:24 +05:30
Deepesh Garg
118c786e63
fix: Partially Ordered status for quotation
2022-06-11 21:55:59 +05:30
Sagar Vora
d87dcb756b
Merge pull request #31323 from alyf-de/remove-datev-from-accounting-workspace
...
fix: remove DATEV from accounting workspace
2022-06-11 10:55:31 +00:00
Deepesh Garg
243625898e
fix(India): Sales taxes and charges template fetching in quotation
2022-06-10 22:05:58 +05:30
Deepesh Garg
2fc04f661a
fix: Company address filter in quotation
2022-06-10 19:23:17 +05:30
barredterra
f6695909c4
fix: remove DATEV from accounting workspace
2022-06-10 15:51:02 +02:00
Ankush Menat
39ec0aca95
fix(UX): use doc.status for Job Card status ( #31320 )
...
fix(UX): use doc.status for JC status
- Use doc.status directly for indicator - single source of truth
- Update status to cancelled when doc is cancelled
2022-06-10 18:43:46 +05:30
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql
...
refactor: migrating data from GL to payment ledger using raw SQL
2022-06-10 17:15:58 +05:30
hendrik
74b274f555
fix: update Period Closing Voucher per Company
...
Validate period closing voucher company-wise
2022-06-10 14:52:53 +05:30
Ankush Menat
450bef8443
Merge pull request #31240 from ankush/repost_match_gle
...
fix: unnecessary GLE reposts
2022-06-10 14:51:45 +05:30
Ankush Menat
3a3d13622d
refactor!: drop github connector from ERPNext ( #31316 )
2022-06-10 14:01:41 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch ( #31315 )
...
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction
Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
2022-06-10 13:52:17 +05:30
ruthra kumar
e2c52436da
refactor: migrate gl to payment ledger using sql
2022-06-10 13:17:43 +05:30
Deepesh Garg
9562c28408
Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule
...
feat: two new groupby mode on gross profit: Monthly, Payment Term
2022-06-10 12:52:35 +05:30
Marica
2941a8ce73
Merge pull request #31303 from marination/update-employee-compatibility-fix
...
fix: locale Currency and Float setting in update_employee
2022-06-10 11:35:02 +05:30
Ankush Menat
6fc32b83c8
fix: revert show title field on Employee doctype ( #31312 )
2022-06-10 11:03:51 +05:30
Deepesh Garg
bbd930184c
Merge pull request #31273 from ruthra-kumar/ignore_payment_ledger_on_loan_cancelation
...
fix: ignore payment ledger on cancellation of loan
2022-06-10 10:55:48 +05:30
Deepesh Garg
a2f34d74f3
Merge pull request #31225 from vishdha/fix_date_range_print
...
fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year
2022-06-10 10:52:53 +05:30
Deepesh Garg
8008653082
Merge pull request #31294 from deepeshgarg007/gstr_3b_taxable_value
...
fix(India): Incorrect taxable in GSTR-3B report
2022-06-10 10:49:14 +05:30
Deepesh Garg
43bf327f9b
Merge pull request #31216 from sunhoww/patch-4
...
fix: Trial Balance failing to ignore Finance Book
2022-06-09 20:34:33 +05:30
Sun Howwrongbum
ee2949aa3f
fix: typo in sql condition
2022-06-09 19:28:59 +05:30
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier ( #31302 )
2022-06-09 19:18:52 +05:30
Deepesh Garg
b9dbb36d0e
chore: Linting Issues
2022-06-09 18:58:04 +05:30
Vladislav
2675751d6c
fix: update ru translate ( #31200 )
...
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
* Update ru.csv
fix logic
* Update ru.csv
* Update ru.csv
* Update ru.csv
2022-06-09 18:46:08 +05:30
RJPvT
17887cde71
fix: locale Currency and Float setting in update_employee
...
In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled
2022-06-09 18:40:51 +05:30
