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

42195 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Deepesh Garg
7c8bceca34
Merge pull request #31016 from HarryPaulo/fix-average-discount-auth 
fix: correction of the calculation to the average value when there is…
 2022-06-09 18:33:42 +05:30
mergify[bot]
e6f65e1697
chore: Asset Arabic translation Fix (backport #31221) (#31301) 
chore: Asset Arabic translation Fix (#31221)

Update ar.csv

Fix Translation arabic translation that caused an error when submitting an asset if user language was arabic

(cherry picked from commit 9347cbbc9f7826116faf22db7bf9f3bf32e6e3c2)

Co-authored-by: meaziz <minaeaziz@gmail.com>
 2022-06-09 17:47:15 +05:30
Marica
60968419e7
Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report 
fix: misaligned columns in print format of AR/AP report
 2022-06-09 17:35:21 +05:30
Ankush Menat
16c8b7404d
Merge pull request #31072 from marination/perf-bom-update-tool 
perf: BOM Update Tool
 2022-06-09 17:04:00 +05:30
marination
3fa0a46f39 chore: Less hacky tests, versioning (replace bom) and clearing log data (update cost) 
- Remove `auto_commit_on_many_writes` in `update_cost_in_level()` as commits happen every N BOMs
- Auto commit every 50 BOMs
- test: Remove hacky `frappe.flags.in_test` returns
- test: Enqueue `now` if in tests (for update cost and replace bom)
- Replace BOM: Copy bom object to `_doc_before_save` so that version.py finds a difference between the two
- Replace BOM: Add reference to version
- Update Cost: Unset `processed_boms` if Log is completed (useless after completion)
- test: `update_cost_in_all_boms_in_test` works close to actual prod implementation (only call Cron job manually)
- Test: use `enqueue_replace_bom`  so that test works closest to production behaviour

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-06-09 16:27:51 +05:30
Ankush Menat
d9a5213952
fix(ux): hide new version btn on unsaved BOM (#31297) 2022-06-09 15:33:18 +05:30
ruthra kumar
bbaa14af16 fix: misaligned columns in print format of AR/AP report 2022-06-09 15:14:44 +05:30
Deepesh Garg
50aafdbe99 chore: cleanup 2022-06-09 11:52:46 +05:30
Deepesh Garg
20f568c159 fix(India): Incorrect taxable in GSTR-3B report 2022-06-09 11:50:37 +05:30
Ankush Menat
a6edce2397
Merge branch 'develop' into perf-bom-update-tool 2022-06-09 11:45:37 +05:30
Ankush Menat
eb53a9727d perf: commit GL reposting periodically 
If you have a huge list of docs to repost then maintaining transaction
throughtout entire GL reposting is not only unnecessary but also creates
performance issues. Periodically commiting the changes prevents lost
progress and reduces memory usage.
 2022-06-09 11:37:43 +05:30
Ankush Menat
67c26325ee fix: unnecessary GLE reposts 
In Sales/Purchase invoices credit/debit are flipped and negated while making GLE,
this is unflipped while posting them but if we compare the flipped ones
it will always result in comparison failure and repost it.
 2022-06-09 11:37:40 +05:30
Rushabh Mehta
b29edb302c
Merge pull request #31284 from rmehta/item-form-cleanup 
fix(ux): Add tabs in Item
 2022-06-08 17:01:57 +05:30
Rushabh Mehta
5c6937865c fix(ux): Add tabs in Item 2022-06-08 16:30:44 +05:30
Marica
2832731601
fix: Use frappe.as_unicode to decode output of redis module list (#31282) 
- As of redis 7, a list is added to the result of fetching the module list
- This list cannot be "decoded",so use `frappe.as_unicode` that handles bytes as well as other types
 2022-06-08 15:52:13 +05:30
marination
7e41d84a11 chore: get_valuation_rate sider fixes 
- Use qb instead of db.sql
- Don't use `args` as argument for function
- Cleaner variable names
 2022-06-08 14:01:04 +05:30
ruthra kumar
018bc2af43 fix: ignore payment ledger on cancellation of loan 2022-06-08 12:03:47 +05:30
marination
9f2793ccf1 test: Fix test_update_bom_cost_in_all_boms 
- Use base_rate for assertions as rate is subject to change due to conversion factor (USD)
 2022-06-08 11:18:53 +05:30
Saqib Ansari
fb4f8d870b
fix(india): e-invoice eligibility if company gstin is not configured (#31247) 2022-06-08 09:36:33 +05:30
Ankush Menat
f830b57fd4 test: sales register report with conditions 2022-06-07 15:23:32 +05:30