Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,906 Commits 3 Branches 0 Tags 1 GiB
34f3a6629f
Commit Graph

929 Commits

Author SHA1 Message Date
Subin Tom
8b2fe9e793
fix: eway bill version changed to 1.0.0421 (#27044) 2021-08-23 11:17:31 +05:30
Deepesh Garg
2b2572b9b9
fix: Cascade deletion for Company (#26923) 
* fix: Cascade deletion for Company
 2021-08-20 14:40:12 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +05:30
Deepesh Garg
3f07bb7021 fix: Add mandatory depends on condition for export type field 2021-08-16 13:18:39 +05:30
Saqib
88f13fef81
fix: ZeroDivisionError on creating e-invoice for credit note (#26915) 2021-08-12 16:26:51 +05:30
Saqib
84c4161c00
fix(e-invoicing): cannot cancel invoice if IRN cancelled on portal (#26638) 2021-08-10 16:46:44 +05:30
Saqib
2ae2580706
fix(asset): incorrect date difference calculation (#26793) 2021-08-10 16:37:48 +05:30
Anuja Pawar
08ae49cd11
fix(regional): add permissions for VAT Audit report (#26851) 
fix(regional): add permissions for VAT Audit report
 2021-08-09 17:58:52 +05:30
harshpwctech
b0f3c0f3fd
fix: JWT decoding error (#26624) 2021-08-09 13:42:05 +05:30
HENRY Florian
07e65ab589
feat: add french address template (#26316) 
* add french address template

Co-authored-by: Ankush <ankush@iwebnotes.com>
 2021-08-09 10:32:31 +05:30
Saqib
e7fa2e5826
fix(e-invoicing): cannot generate IRNs for standalone credit notes (#26824) 2021-08-06 11:03:57 +05:30
Saqib
3a50490c04
fix: fetching of item tax from hsn code (#26736) 
* fix: fetching of item tax from hsn code
 2021-08-03 15:57:11 +05:30
Deepesh Garg
4e1a205c11 fix: Optimize item updation 2021-08-03 14:58:45 +05:30
Deepesh Garg
346bde875c Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report 2021-08-03 14:44:20 +05:30
Anuja
f2ee1155c0 fix: sider fixes 2021-08-02 23:13:21 +05:30
Anuja
3bcbc86291 fix: resolved conflicts in patches.txt 2021-08-02 12:58:46 +05:30
Anuja
f9fc3bbfa8 fix: added patch for custom field and minor fixes 2021-08-02 12:54:30 +05:30
Subin Tom
58118d7830
fix: missing QR Code in auto email attachment (#26598) 2021-08-02 11:34:43 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report 2021-08-02 10:42:04 +05:30
Rohit Waghchaure
343143037c fix: conflicts 2021-08-01 14:45:24 +05:30
Anuja
5dcd5e48e7 fix: fixed zero tax rate issue by adding custom field 2021-07-29 00:54:48 +05:30
Afshan
42bc0a7db8
fix: documentation link for E Invoicing (#26684) 2021-07-28 13:42:53 +05:30
Afshan
868a6cb26d
fix: documentation link for E Invoicing (#26686) 2021-07-28 13:42:13 +05:30
Anuja Pawar
9302e0b6c5
Merge branch 'develop' into sa-vat-report 2021-07-27 10:18:53 +05:30
Deepesh Garg
af84ce9216
Merge pull request #26647 from deepeshgarg007/gst_sales_register_fix_v13 
fix(India): Default value for export type
 2021-07-27 10:12:33 +05:30
Deepesh Garg
1b6c75bbb1
Merge pull request #26642 from deepeshgarg007/gstr_3b_missing_cess_develop 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:21:29 +05:30
Deepesh Garg
61d014d249
Merge pull request #26644 from deepeshgarg007/gstr_3b_missing_cess_v13 
fix: Add missing cess amount in GSTR-3B report
 2021-07-26 19:20:50 +05:30
Deepesh Garg
cba847b051 fix: Test case for GSTR-3b report 2021-07-26 18:46:27 +05:30
Deepesh Garg
a661667e2a fix(India): Default value for export type 2021-07-26 18:46:14 +05:30
Anuja Pawar
abc63cffa8 fix: suggested changes 2021-07-26 18:11:38 +05:30
Deepesh Garg
5fe7d80a64 fix: GST Reports timeout issue 2021-07-26 17:13:28 +05:30
Deepesh Garg
19589b1e21 fix: GST Reports timeout issue 2021-07-26 17:05:48 +05:30
Deepesh Garg
c468e4a93d fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:58:07 +05:30
Deepesh Garg
00fd319531 fix: Add missing cess amount in GSTR-3B report 2021-07-26 16:52:54 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
Subin Tom
b24a149dbc test: Updated test case for Eway bill 2021-07-19 14:37:12 +05:30
Anuja Pawar
2bbf48e835
Merge branch 'develop' into sa-vat-report 2021-07-18 11:13:25 +05:30
Nabin Hait
11475487fb fix: merge conflict 2021-07-16 15:58:50 +05:30
Anuja Pawar
259947dae9
Merge branch 'develop' into sa-vat-report 2021-07-14 20:47:41 +05:30
Anuja Pawar
b43974a9a6 fix: more sider fixes 2021-07-14 20:37:48 +05:30
Anuja Pawar
c5d7a13513 fix: sider & translation fixes 2021-07-14 15:49:22 +05:30
Anuja Pawar
b37ff0d3cf fix: sider fixes 2021-07-14 15:06:56 +05:30
Frappe
1dfb5eb535 feat: South Africa VAT report 2021-07-14 12:33:45 +05:30
Deepesh Garg
7ff6865817
Merge pull request #26470 from deepeshgarg007/new_company_error_v13 
fix: Errors on parallel requests creation of company for India
 2021-07-13 20:30:06 +05:30
Deepesh Garg
1ee63f31e5 Merge branch 'develop' of https://github.com/frappe/erpnext into bootstrapped_gst_setup_develop 2021-07-13 16:51:47 +05:30
Deepesh Garg
779d2afa60 fix: Update account heads in GST test cases 2021-07-13 16:50:04 +05:30
Deepesh Garg
269510b98f fix: Regional settings setup 2021-07-13 16:48:22 +05:30
Deepesh Garg
a72589cb7e fix: Add accounts and templates for reverse charge 2021-07-13 16:48:06 +05:30
Deepesh Garg
0380cca3b7 fix: Add GST accounts to GST Settings 2021-07-13 16:47:38 +05:30
Deepesh Garg
96300fa791 fix: Add validation for GST Settings 2021-07-13 16:47:38 +05:30
Deepesh Garg
8ed1afd93d fix: Remove redundant get_doc 2021-07-13 16:47:38 +05:30
Deepesh Garg
8fd2d8b5d0 fix: Ignore validations for Tax Setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
a90e5fd2e1 fix: Issues on new company setup 2021-07-13 16:47:38 +05:30
Deepesh Garg
fea29ae8cb fix: Use update flag for company dependant fixtures 2021-07-13 16:05:05 +05:30
Deepesh Garg
7be9f8dab1 fix: Error on creation of company for India 2021-07-13 16:04:56 +05:30
Deepesh Garg
0bad696faf fix: Unable to download GSTR-1 json 2021-07-13 15:46:58 +05:30
Deepesh Garg
fc9714b871 fix: Unable to download GSTR-1 json 2021-07-13 15:45:34 +05:30
Subin Tom
5265ba39f0 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-07-13 14:58:17 +05:30
Saqib
fe4f58d0f6
fix(e-invoicing): allow export invoice even if no taxes applied (#26405) 2021-07-09 15:32:54 +05:30
Saqib
8e8434a78a
fix: omit item discount amount for e-invoicing (#26353) (#26407) 2021-07-09 15:32:28 +05:30
Saqib
77e00403c8
fix: omit item discount amount for e-invoicing (#26353) 2021-07-09 14:41:03 +05:30
Saqib
b199702977
fix(e-invoicing): allow export invoice even if no taxes applied (#26363) 2021-07-09 14:37:34 +05:30
Saqib
0b320b5909
Merge pull request #25798 from GangaManoj/asset-repair-refactor 
refactor: Asset Repair
 2021-07-07 12:44:50 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup 
feat(India): Bootstrapped GST Setup
 2021-07-06 21:44:30 +05:30
Deepesh Garg
63096014a7 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-07-02 20:30:18 +05:30
Afshan
b6076f772d fix: only "Tax" type accounts should be shown for selection in GST Settings 2021-07-02 15:39:16 +05:30
Afshan
20f73d4c58 fix: only "Tax" type accounts should be shown for selection in GST Settings 2021-07-02 15:34:26 +05:30
Saqib
4b69563a56
Merge branch 'develop' into asset-repair-refactor 2021-06-28 11:07:58 +05:30
Deepesh Garg
ebc46c1e09 fix: Update account heads in GST test cases 2021-06-28 10:52:38 +05:30
Deepesh Garg
2dc90dd8ac fix: Export invoices not visible in GSTR-1 report 2021-06-24 10:37:19 +05:30
Deepesh Garg
673470705b Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-23 11:33:15 +05:30
Saqib
4b4eb990a9
Merge branch 'develop' into asset-repair-refactor 2021-06-22 16:21:13 +05:30
Deepesh Garg
cfdda21dd2 fix: Export invoices not visible in GSTR-1 report 2021-06-22 13:03:22 +05:30
GangaManoj
da8da9fa4e fix: Replace edit_dates with flags.increase_in_asset_life 2021-06-19 14:00:26 +05:30
GangaManoj
2b93e54e1f fix(Asset Repair): Fix depreciation_amount calculation 2021-06-19 13:45:37 +05:30
Saqib Ansari
2be7e90e78 fix(e-invoicing): IRN generation for export invoices with round off 2021-06-16 19:00:34 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Deepesh Garg
4afda3c89c fix(India): Taxable value for invoices with additional discount 2021-06-14 20:43:42 +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
Ankush Menat
a424c0c023
test(perf): eliminate repeat creation of HSN codes (bp #25947) 2021-06-11 16:49:39 +05:30
Ankush Menat
5bb89b0ead
test(perf): eliminate repeat creation of HSN codes (#25947) 2021-06-11 15:57:01 +05:30
Saqib
9a67141bfb
fix(einvoicing): service item check (#26010) 2021-06-10 18:48:55 +05:30
Deepesh Garg
88176e65e4 fix: Check for gst_hsn_code 2021-06-10 17:31:28 +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
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
Saqib Ansari
18eed58fc5 fix(e-invoicing): service item check 2021-06-08 20:52:14 +05:30
Deepesh Garg
7a20c3b92a fix: Ignore internal transfer inoices from GST Reports 2021-06-06 19:23:21 +05:30
Deepesh Garg
ca34eec2d6 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-06-02 13:26:27 +05:30
Deepesh Garg
b3ed807b70 fix: Regional settings setup 2021-06-02 13:26:21 +05:30
Deepesh Garg
c6dcc9d94a fix(India): Taxable value for invoices with additional discount 2021-06-01 13:13:04 +05:30
Nabin Hait
a3d1b6973a fix: merge conflict 2021-05-31 11:21:33 +05:30
Deepesh Garg
48b1a82fa1 fix: Add accounts and templates for reverse charge 2021-05-29 23:54:51 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address 
fix(India): Show only company addresses for ITC reversal entry
 2021-05-28 18:46:09 +05:30
Deepesh Garg
b084f1d320 fix(India): Show only company addresses for ITC reversal entry 2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d fix(India): Show only company addresses for ITC reversal entry 2021-05-28 11:57:38 +05:30
Suraj Shetty
19c5fd72d6 refactor: Rename assertEquals to assertEqual to avoid deprecation warnings 2021-05-28 09:10:33 +05:30
Deepesh Garg
4311fdc3a1 Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup 2021-05-27 17:49:23 +05:30
Deepesh Garg
36a11bf9ce
Merge pull request #25841 from nextchamp-saqib/fix(gstr-1)--incorrect-gstin-fetched-incase-of-branch-company-address 
fix(gstr-1): incorrect gstin fetched incase of branch company address
 2021-05-26 11:20:30 +05:30