Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,438 Commits 3 Branches 0 Tags 1 GiB
9d8e8f8bdf
Commit Graph

27127 Commits

Author SHA1 Message Date
Noah Jacob
b5a1491176
fix: escaped warehouse value for sql query (#26049) 2021-06-15 12:44:04 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes 
fix: Auto tax calculations in Payment Entry
 2021-06-14 20:39:41 +05:30
Deepesh Garg
4cd0f6ce23 fix: Revert unintended changes 2021-06-14 20:01:04 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount 
fix(India): Taxable value for invoices with additional discount
 2021-06-14 17:11:08 +05:30
GangaManoj
75b30efb05 fix(General Ledger): Filter Project drop-down list by Company 2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021 fix(General Ledger): Filter Cost Center drop-down list by Company 2021-06-14 16:41:56 +05:30
marination
3b070d1b05 fix: Flaky test for Report Subcontracted Raw materials to be transferred 2021-06-14 14:51:33 +05:30
Deepesh Garg
9eac4d0af6 fix: Import throw 2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96 fix: Add separate function to validate payment entry taxes 2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30 fix(General Ledger): Implement multi-account selection 2021-06-14 13:22:44 +05:30
Nabin Hait
ad58182395
Merge pull request #26030 from ruchamahabal/add-inactive-status-to-employee-v13 
feat: add Inactive status to Employee
 2021-06-14 12:33:28 +05:30
Deepesh Garg
856484aeb0 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f fix: Auto tax calculations in Payment Entry 2021-06-14 11:16:39 +05:30
Anoop
28cdff10cf
fix: update linked Customer on Patient update only if Link Customer to Patient is enabled (#25926) 2021-06-12 14:17:04 +05:30
Rucha Mahabal
cf349aadf9
fix: unable to enter score in Assessment Result details grid (#25945) (#26031) 2021-06-12 14:05:12 +05:30
Rucha Mahabal
17550fb4bf feat: add Inactive status to Employee 2021-06-12 13:36:47 +05:30
Anupam Kumar
400205cc8a
fix: payroll entry employee detail issue (#25968) 
* fix: payroll entry employee detail issue

* fix: review changes
 2021-06-12 12:30:53 +05:30
Marica
d7d5c4c329
Merge pull request #26011 from marination/subcontracted-rm-to-transfer-report 
fix: Report Subcontracted Raw Materials to be Transferred
 2021-06-11 17:50:30 +05:30
marination
c4d851e45f fix: Test 2021-06-11 17:27:43 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions (#25645) 2021-06-11 16:00:48 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes (#25947) 2021-06-11 15:57:01 +05:30
marination
ec4a3723cc fix: Sider 2021-06-11 12:47:06 +05:30
marination
687ad9b942 fix: Report Raw Materials to be Transferred 2021-06-10 21:18:19 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13 
feat: Tax deduction against advance payments
 2021-06-10 20:25:30 +05:30
Deepesh Garg
3b34fc4cce Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates 2021-06-10 18:56:39 +05:30
Deepesh Garg
0d49b6c211
Merge pull request #26004 from gavindsouza/patch-tests-v13 
ci: Update Patch tests (backport)
 2021-06-10 18:52:27 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check (#26010) 2021-06-10 18:48:55 +05:30
Deepesh Garg
9a243ed469 fix: Sort account balances by account name 2021-06-10 18:16:46 +05:30
Deepesh Garg
a5c3427293 fix: Sort account balances by account name 2021-06-10 18:09:49 +05:30
Deepesh Garg
88176e65e4 fix: Check for gst_hsn_code 2021-06-10 17:31:28 +05:30
Gavin D'souza
137d08a9d7 fix: Manually link_fields from flags before rename_doc 2021-06-10 15:09:17 +05:30
Gavin D'souza
96f8ebc308 fix(patch): Handle NULL values from fieldtype change 2021-06-10 15:08:55 +05:30
Gavin D'souza
3dfbfe87e9 chore: Drop < v10 patches from list 
v7 backup was restored and upgraded to latest v10.x.x branch. The patches run uptil the upgrade are removed in this change. This means only existing v10 sites are allowed direct upgrade to v13 and newer

There are older version patches still left since they're being used in later ERPNext versions too.
 2021-06-10 15:07:56 +05:30
Gavin D'souza
aedf25ba46 chore: Drop old patches 
v7 backup was restored and upgraded to latest v10.x.x branch. The
patches run uptil the upgrade are removed in this change. This means
only existing v10 sites are allowed direct upgrade to v13 and newer
 2021-06-10 15:07:39 +05:30
rohitwaghchaure
8975c5241e
Merge pull request #25988 from rohitwaghchaure/donot-copy-difference-account 
fix: on click of duplicate button system has not copied the difference account
 2021-06-10 14:39:56 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card 
fix: Only display GST card in Accounting Workspace if it's in India
 2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1 fix: GL Entry ordering 2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab fix: Only display GST card in Accounting Workspace if it's in India 2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount 2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6 fix: Update einvoice json test 2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb fix: Failing test case 2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2 fix: Add multiple fixes 2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry (#25766) 2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos (#25822) 2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db fix: Test case 2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry (#25799) 2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207 fix: Debug tests 2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162 fix: Debug test 2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-09 13:39:07 +05:30
Deepesh Garg
bf5f87c2fe
Merge pull request #25969 from deepeshgarg007/inernal_transfer_invoices_ignore 
fix: Ignore internal transfer invoices from GST Reports
 2021-06-09 13:32:52 +05:30
Deepesh Garg
be631d1caf
Merge pull request #25986 from nextchamp-saqib/einvoicing-service-item-check 
fix(e-invoicing): service item check
 2021-06-09 13:00:43 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field (#25380) 
* fix: hiding Rounding Adjustment field

* fix: updating purchase_invoice.json
 2021-06-09 12:57:21 +05:30
Deepesh Garg
9a282aa593
Merge pull request #25858 from alyf-de/item-tax-templates 
feat: Item Tax Templates for Germany
 2021-06-09 12:50:27 +05:30
Rohit Waghchaure
99b583f688 fix: on click of duplicate button system copy the difference account from first row 2021-06-09 00:06:35 +05:30
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +05:30
Rucha Mahabal
5ed2ef493a
Merge pull request #25984 from pateljannat/quiz-fixes-v13 
fix: Quiz fixes v13
 2021-06-08 18:57:24 +05:30
pateljannat
7ace06ac21 fix: sider 2021-06-08 18:26:23 +05:30
Ganga Manoj
0ea4d850e1
fix: Allow all System Managers to delete company transactions (#25834) 2021-06-08 17:23:44 +05:30
pateljannat
bbf07d9214 fix: quiz timer issues 2021-06-08 17:05:44 +05:30
Deepesh Garg
e4fcc5562f refactor: Advance taxes and charges calculation 2021-06-08 16:35:47 +05:30
Sagar Vora
062e247353 test: remove unused imports 2021-06-08 14:43:28 +05:30
Sagar Vora
ca205be5ac fix: tests 2021-06-08 14:43:28 +05:30
Sagar Vora
0e5e1350b2 perf: use frappe.get_value with wildcard instead of another frappe.get_doc call 2021-06-08 14:43:28 +05:30
Sagar Vora
74818c7b62 fix: improve filter for from_date; validation for joining and relieving date 2021-06-08 14:43:28 +05:30
Sagar Vora
447c978757 fix: choose correct Salary Structure Assignment when getting data for formula eval 2021-06-08 14:43:28 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos (#25971) 2021-06-07 16:20:21 +05:30
rohitwaghchaure
cf7baeab16
Merge pull request #25956 from rohitwaghchaure/fixed-conversion-factor-issue 
fix: custom conversion factor field not mapped from job card to stock entry
 2021-06-07 11:45:44 +05:30
Deepesh Garg
6f2dacc60c Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13 2021-06-06 19:31:50 +05:30
Deepesh Garg
7a20c3b92a fix: Ignore internal transfer inoices from GST Reports 2021-06-06 19:23:21 +05:30
Deepesh Garg
18be767f75 fix: Remove invalid test 2021-06-06 13:25:34 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8 
fix(pos): multiple pos issues
 2021-06-06 11:25:29 +05:30
Saqib Ansari
3f32969bee fix(pos): broken image in item details section 2021-06-06 11:18:20 +05:30
Saqib Ansari
bc46a9772d fix(pos): cash shortcuts not working 2021-06-06 11:11:07 +05:30
Saqib Ansari
a85c2c16b4 fix(pos): item rate precision in item selector 2021-06-06 11:07:20 +05:30
Deepesh Garg
3646c301ed fix: Linting issues 2021-06-05 13:21:03 +05:30
Deepesh Garg
e8a78bd43d fix: Add test cases 2021-06-05 13:16:39 +05:30
Deepesh Garg
8a7e283926 feat: Item Taxes based on net rate 2021-06-04 22:53:26 +05:30
barredterra
572b6df0f2 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-04 16:55:11 +02:00
Ankush Menat
215516f819
fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice' (#25902) (#25957) 
* fix: AttributeError: 'PurchaseReceiptItem' object has no attribute 'purchase_invoice'

This error occurs when upgrading from erpnext 13.0.1 to 13.4.0 after typing
bench update --patch --reset

* fix(minor): use .get instead of getattr

Co-authored-by: D Tim Cummings <tim@triptera.com.au>
 2021-06-04 13:09:14 +05:30
Rucha Mahabal
3f45901f25
fix: invalid 'depends_on' expression in opportunity (#25955) 2021-06-04 11:16:38 +05:30
Rohit Waghchaure
af4794b2d1 fix: custom conversion factor field not mapped from job card to stock entry 2021-06-04 10:53:44 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice (#25775) 2021-06-04 10:08:22 +05:30
Saqib Ansari
4a1e270072 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into pos-fixes-8 2021-06-04 10:04:09 +05:30
Saqib Ansari
48036b4bab fix: invoices can alter profit and loss of a closed year 2021-06-04 09:54:34 +05:30
rohitwaghchaure
25b953ad16
Merge pull request #25854 from rohitwaghchaure/fixed-timeout-error-in-repost-item-valuation 
fix: timeout error in the repost item valuation
 2021-06-03 22:14:22 +05:30
rohitwaghchaure
c59371ab0c
fix: filter type for item query (#25942) 2021-06-03 20:02:58 +05:30
barredterra
c99eaf106e Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-03 14:17:43 +02:00
Rohit Waghchaure
10558344b0 fix: timeout error in the repost item valuation 2021-06-03 16:34:31 +05:30
Marica
7437748a1d
Merge pull request #25805 from ankush/refactor_item 
refactor: item doctype
 2021-06-03 14:23:18 +05:30
Saqib Ansari
81b9a5ee47 fix(pos): cannot cancel consolidated sales invoice 2021-06-03 12:59:09 +05:30
Saqib Ansari
311b378328 fix(pos): searching items with barcode or serial no 2021-06-03 12:58:53 +05:30
rohitwaghchaure
40b90e5b6e
Merge pull request #25478 from noahjacob/prod_plan_feat 
feat: Added check box to combine items with same BOM
 2021-06-03 12:37:02 +05:30
Marica
e7d9200e0f
Merge pull request #25221 from Alchez/dev-quality-inspection-accounts 
feat: create Quality Inspections from account and stock documents
 2021-06-03 01:39:05 +05:30
barredterra
9affcd8f54 Merge branch 'version-13-hotfix' into item-tax-templates 2021-06-02 17:54:02 +02:00
Nabin Hait
88d94dbf0a
Merge pull request #25915 from rohitwaghchaure/fixed-work-order-no-able-to-select-item 
fix: not able to select the item code in work order
 2021-06-02 19:00:34 +05:30
Raffael Meyer
f6627550d1
fix: remove wrong tax_category 2021-06-02 15:17:00 +02:00
barredterra
3c748efae3 feat: add Item Tax Templates for german COAs "SKR03" and "SKR04" 2021-06-02 13:27:15 +02:00
barredterra
b6f27a4cae feat: set is_default for german tax templates 2021-06-02 13:20:33 +02:00