Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,264 Commits 3 Branches 0 Tags 1 GiB
74ccaeb07d
Commit Graph

29670 Commits

Author SHA1 Message Date
Deepesh Garg
508832e90a fix: Add patch to make custom fields 2021-11-08 17:46:24 +05:30
Deepesh Garg
c81d4734c4 fix: KSA VAT setup issues 2021-11-08 17:14:03 +05:30
Deepesh Garg
419e03954c
Merge pull request #28166 from Havenir/ksa-vat 
feat(Print Format): KSA VAT Invoice
 2021-11-08 15:27:02 +05:30
ahmadpak
8df50cf1e0 update(Print Format): Sales Invoice 
- KSA VAT Invoice
Customer Identification Number Added
 2021-11-08 09:29:33 +03:00
Ankush Menat
db3193dcab
chore: remove migration_hash (#28263) 2021-11-08 10:57:20 +05:30
mergify[bot]
c0b889b94d
fix: auto update price list rate (#28255) (#28256) 
* fix: auto update price list rate

* fix: hide field when auto insert isn't enabled

(cherry picked from commit bb3957eba35a5204a1a01e412dee596532bd525e)

Co-authored-by: Sagar Sharma <63660334+s-aga-r@users.noreply.github.com>

[skip ci]
 2021-11-07 17:42:51 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
897e90ac55 chore: remove past module dependencies 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
mergify[bot]
25f647f067
fix: Bulk update of valid upto field wasn't working (bp #28242) 
* fix: Bulk update of valid upto field wasn't working

Check in dates for the price list was failing because valid_upto field was string. Converting to date fixed the problem.

* chore: extend fix and cleanup whitespace

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 95a5ef1d416d54ecf0f557586b341b0dce2a0b05)

Co-authored-by: fatihustaoglu <46131068+fatihustaoglu@users.noreply.github.com>
 2021-11-04 21:46:48 +05:30
Raffael Meyer
114028e473
feat: replace newline in remarks (DATEV report) (#28152) 2021-11-04 21:44:24 +05:30
Saqib Ansari
b7a44fe0a3 perf: improve financial statement loading time 2021-11-03 18:17:31 +05:30
Anupam
7044ae5e39 fix: testcases: 2021-11-03 17:41:04 +05:30
Noah Jacob
cb064b06ad
fix: added job_card_item link in material request (#28222) 
* fix: added job_card_item links in material request

* fix: add no copy to row references
 2021-11-03 11:53:57 +00:00
Anuja Pawar
0d65a6e333
Merge branch 'develop' into gst-category 2021-11-03 15:49:22 +05:30
Anupam
cc15cf6ae2 fix: linter isuue 2021-11-03 13:54:46 +05:30
Anupam Kumar
8ebc412e8b
Merge branch 'develop' into manufacturing-work-order-stop 2021-11-03 13:41:37 +05:30
Anupam
ba47bd02b6 fix: sider isuue 2021-11-03 13:41:22 +05:30
Anupam
9b4c7e4796 fix: validate job card 2021-11-03 13:27:50 +05:30
Saqib
a5902fa3f8
Merge pull request #28187 from hrwX/subscription_active_fixes 
fix: do not generate multiple invoices
 2021-11-03 11:40:39 +05:30
Anuja Pawar
3c4484fbf9
Merge branch 'develop' into gst-category 2021-11-02 23:30:16 +05:30
Anuja Pawar
f2fbcc8124 fix: sider 2021-11-02 23:29:06 +05:30
Anupam
9c0906f1b5 fix: test cases 2021-11-02 20:43:00 +05:30
Deepesh Garg
11e90cc0be
Merge pull request #28205 from deepeshgarg007/lower_deduction_validation_fix 
fix: Error on LDC creation
 2021-11-02 20:27:18 +05:30
Deepesh Garg
66348e1a03 fix: Error on LDC creation 2021-11-02 20:26:40 +05:30
Marica
91112c49e1
Merge pull request #28202 from marination/serial-no-popup-with-scanner 
fix: Serial Nos not set in the row after scanning in popup
 2021-11-02 20:17:48 +05:30
hrwx
2bce193b81 Merge branch 'develop' of https://github.com/frappe/erpnext into subscription_active_fixes 2021-11-02 14:05:10 +00:00
Saqib
ec0a72423a
fix: Calculate depreciation_amount accurately (#27585) 2021-11-02 18:45:03 +05:30
marination
734b57deec fix: Serial Nos not set in the row after scanning in popup 
- Avoid whitspaces while calculating length of serial nos
 2021-11-02 18:34:55 +05:30
Noah Jacob
857d87da97
fix: replaced "=" with "in" for multiple statuses in query #28193 
fix: replaced "=" with "in" for multiple statuses in query
 2021-11-02 17:52:45 +05:30
Saqib
7681600b5e
fix: test wdv method for indian region 2021-11-02 17:47:44 +05:30
hrwx
890a786858 fix: do not generate multiple invoices 2021-11-02 11:58:01 +00:00
GangaManoj
f047c6ffc8 fix: Test for WDV 2021-11-02 16:43:31 +05:30
Anuja Pawar
d72709dd81
fix(Payment Entry): splitting outstanding rows as per payment terms (#27946) 2021-11-02 16:28:46 +05:30
marination
48886ee705 chore: Add comment above fix for future reference 2021-11-02 15:57:41 +05:30
marination
048210a8f6 fix: Remove warehouse filter on Batch field for Material Receipt 2021-11-02 15:49:58 +05:30
Anupam
e36da4d137 fix: linter issues 2021-11-02 12:53:00 +05:30
Anupam
59e4fd980c fix: linter issues 2021-11-02 12:46:00 +05:30
Anupam
530a0f481e fix: added testcase 2021-11-02 12:39:13 +05:30
Smit Vora
e2d866d6a2 fix: regional(India) totalValue for ewaybill 2021-11-01 15:55:19 +05:30
Ankush Menat
1eab3a44f6 fix(ux): stock levels take time after item merge 
Item merge creates a repost and depending on number of entries it can
take from 1 to n hours for it to finish. (depending upon queued up
reposts)

Added message so users don't feel confused till this operation is
finished.
 2021-11-01 15:32:59 +05:30
Ankush Menat
f7ffe04a4b fix: use warehouse to find company 2021-11-01 14:13:56 +05:30
Ankush Menat
a0727b2e82 fix: pass company while fetching valuation rate 
If company is not supplied and valuation rate is 0, then default
company is used for checking if perpetual inventory is enabled or not.
This makes little sense as different companies can have different
setting for perpetual inventory.
 2021-11-01 14:13:56 +05:30
Anupam Kumar
623776dd48
feat: added company field in prospect (#28139) 
* feat: added company field in prospect

* fix: review changes
 2021-11-01 13:37:31 +05:30
Anuja Pawar
dd3cadd46b fix: update set_value query 2021-11-01 11:38:02 +05:30
Anuja Pawar
19f78c2f31
Merge branch 'develop' into gst-category 2021-11-01 11:30:23 +05:30
Deepesh Garg
ddcdf64f35
Merge pull request #28156 from kennethsequeira/ind-tx 
fix: update tax template name for 18% GST
 2021-10-31 18:53:40 +05:30
Anupam
264b0df9ff fix: sider issue 2021-10-31 16:11:11 +05:30
Anupam
55e97dce8a fix: sider issue 2021-10-31 14:45:36 +05:30
Anupam
e290fe0721 fix: sider issue 2021-10-31 14:42:10 +05:30
Anupam
5d4c5652af feat: added confirm dialog on closing of workorder 2021-10-31 14:20:03 +05:30
Rohit Waghchaure
cae29b71d8 fix: patch update_category_in_ltds_certificate 2021-10-31 09:24:07 +05:30
ahmadpak
2a5beec885 new (Print Format): KSA VAT Invoice 2021-10-30 17:18:45 +03:00
Deepesh Garg
fb9e72cc8a
Merge pull request #28162 from deepeshgarg007/pan_field_missing_error 
fix: Error for missing PAN no field
 2021-10-30 19:29:26 +05:30
Deepesh Garg
541c892f97 fix: Error for missing PAN no field 2021-10-30 18:22:46 +05:30
Kenneth Sequeira
ad5cf467c0
fix: update tax template name for 18% GST 2021-10-30 13:07:36 +05:30
Anuja Pawar
f9e7dc3f62
Merge branch 'develop' into gst-category 2021-10-29 21:32:49 +05:30
Anuja Pawar
bc1e7bc15f fix: re-writing sql query with ORM methods 2021-10-29 21:32:20 +05:30
Anuja Pawar
1a6e98ed48
fix(Payment Reconciliation): clear child tables on company/party change (#28008) 2021-10-29 20:52:47 +05:30
Ganga Manoj
15e9b5170d
fix: Make status filter optional (#28126) 2021-10-29 18:07:11 +05:30
Anupam
23af036894 feat: provision to close the Work Order 2021-10-29 17:27:17 +05:30
Deepesh Garg
eb720d18c3
Merge pull request #28145 from deepeshgarg007/coa_import_is_group 
fix: COA importer importing all accounts as group
 2021-10-29 17:04:20 +05:30
Ankush Menat
ff9cfe0d14 fix: sort by creation to break tie 2021-10-29 16:56:15 +05:30
Ankush Menat
f4b60a48f5 refactor: simplify sr no fetching 2021-10-29 16:56:15 +05:30
Ankush Menat
2aa019ae4c fix: fetch serial nos from ledger unconditionally 2021-10-29 16:56:15 +05:30
Noah Jacob
deb6b38fab refactor: replaced db.sql with qb 2021-10-29 16:56:15 +05:30
Noah Jacob
b44945380d fix: incorrect amount of serial_nos fetched 2021-10-29 16:56:15 +05:30
Subin Tom
75a76e634d
fix: POS consolidated invoice rounded total issue (#28006) 2021-10-29 16:45:04 +05:30
Deepesh Garg
8ccd3fee9e fix: COA importer importing all accounts as group 2021-10-29 16:08:52 +05:30
Deepesh Garg
199fc52917
Merge pull request #27994 from rtdany10/patch-8 
fix: incorrect VAT Amount in UAT VAT 201 report
 2021-10-29 14:42:02 +05:30
Deepesh Garg
7180d76b36
Merge pull request #28135 from deepeshgarg007/accounting_dimension_userperm 
fix: Accounting Dimension filters not honouring user permissions
 2021-10-29 14:39:58 +05:30
Marica
292419bc9e
fix: Skip empty rows while updating unsaved BOM cost (#28136) 
- Dont try to get valuation rate if row has no item code
- Dont try to add exploded items if row has no item code
 2021-10-29 13:49:27 +05:30
Ankush Menat
afe09d4e80
test: remove unnecessary creation of new company (#28137) 2021-10-29 13:45:07 +05:30
Deepesh Garg
aa9e78bed1 fix: Accounting Dimension filters not honouring user permissions 2021-10-29 12:45:19 +05:30
Anuja Pawar
4589f39875
Merge branch 'develop' into gst-category 2021-10-29 12:41:04 +05:30
Deepesh Garg
d0e2b52f51
Merge pull request #28122 from nemesis189/consolidated-finan-report-empty-list-error 
fix: Consolidated Financial Report throws error for empty equity data list
 2021-10-29 12:11:16 +05:30
Deepesh Garg
051aaa708d fix: Ignore PO on So cancel 2021-10-29 11:35:34 +05:30
Anuja Pawar
d23b7a77b8
Merge branch 'develop' into gst-category 2021-10-28 23:22:03 +05:30
Ganga Manoj
61757c17ae
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 21:06:00 +05:30
GangaManoj
d24cfff388 fix: Remove unused imports 2021-10-28 20:06:48 +05:30
GangaManoj
1a9d2684e2 fix: Remove debugger 2021-10-28 19:27:45 +05:30
GangaManoj
8844fdbf23 fix: Remove print statements 2021-10-28 19:26:09 +05:30
Deepesh Garg
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d fix: Rewrite patch using query builder 2021-10-28 19:01:24 +05:30
Deepesh Garg
8e2b4ef456
Merge branch 'develop' into unlink-po-on-cancelling-so 2021-10-28 14:44:34 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Subin Tom
d786855d94 fix: Consolidated Financial Report throws error for empty equity data list 2021-10-28 13:19:19 +05:30
Saqib
f530764105
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 12:43:51 +05:30
Faris Ansari
c8d0d9ece9
Merge pull request #28048 from netchampfaris/print-format-builder-templates 
feat: Taxes template for selling/buying doctypes
 2021-10-28 12:33:21 +05:30
Saqib
cc7a21eafa
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 12:04:07 +05:30
Anupam Kumar
4787a75208
fix: opportunity link is missign from customer (#28110) 2021-10-28 11:13:11 +05:30
Ganga Manoj
8774862c8d
Merge branch 'develop' into fix-depr-after-sale 2021-10-28 02:15:26 +05:30
Deepesh Garg
c5a16a999c
Merge pull request #28114 from deepeshgarg007/fs_auto_email_report 
fix: Autoemail report not showing dynamic report filters
 2021-10-27 19:58:26 +05:30
Ankush Menat
d81b87d9b3 fix(ux): make qty 1 by default in WO 2021-10-27 19:46:06 +05:30
Ankush Menat
2221c9ed89 fix: don't show blocked supplier in autocomplete 2021-10-27 19:46:06 +05:30
Ankush Menat
5902762ec8 fix(ux): alternative item two way validation 2021-10-27 19:46:06 +05:30
Ankush Menat
5f9bd9b8e9 fix: remove bad hardcoded max value 2021-10-27 19:46:06 +05:30
Deepesh Garg
3a6894fb9c fix: Autoemail report not showing dynamic report filters 2021-10-27 19:39:18 +05:30
Saqib
a261d08dd8
fix: reset temporary flag after use 2021-10-27 18:30:37 +05:30
Saqib
470c07c6e9
Merge branch 'develop' into fix-depr-after-sale 2021-10-27 16:02:38 +05:30