Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
40,033 Commits 3 Branches 0 Tags 1 GiB
4390adcaa1
Commit Graph

1040 Commits

Author SHA1 Message Date
Deepesh Garg
3438e1f0c4
Merge pull request #29175 from rtdany10/patch-14 
fix: seperate custom field creation for KSA
 2022-01-15 20:52:57 +05:30
Deepesh Garg
ae95439c7e
Merge pull request #29208 from deepeshgarg007/nil_exempt_non_gst_gstr_1 
fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report
 2022-01-14 19:43:40 +05:30
Saqib Ansari
203fca45bf
fix: order of company form fields (#29287) 2022-01-14 14:59:58 +05:30
Deepesh Garg
55c445cd37 fix: JSON for nil/exempt and non gst 2022-01-13 22:39:57 +05:30
Deepesh Garg
7d85755595 fix(India): NIL Rated, Exempted and non gst invoices in GSTR-1 report 2022-01-10 12:50:34 +05:30
Dany Robert
63a4c1d926
chore: linter style 2022-01-06 18:48:02 +05:30
Dany Robert
00b2dede14
fix: function name issue 2022-01-06 18:42:56 +05:30
Dany Robert
90eb046ce6
fix: remove unwanted fields from KSA setup 2022-01-06 18:15:40 +05:30
Deepesh Garg
fe929304cf fix: Currency in KSA VAT report 
(cherry picked from commit 1d87e9d8f67e3611993d638f2d422fe66acf2c00)
 2022-01-06 10:53:14 +00:00
Saqib Ansari
f4db474be0
fix: minor issues (#29130) 2022-01-04 19:12:19 +05:30
Deepesh Garg
466e549842 fix(India): Tax and Charges template not getting fetched based on tax category assigned 
(cherry picked from commit 7a5937a98c3d74bdb1da79c3d5a8f49ef76ded2d)
 2022-01-02 13:36:41 +00:00
Deepesh Garg
12a65eef8a fix: Is Reverse Charge check in Tax Category 
(cherry picked from commit b33fd6acc769dbfaa43c665c19f378e8e041d010)

# Conflicts:
#	erpnext/patches.txt
 2021-12-21 08:12:08 +00:00
Saqib
ae71b704ff
Merge pull request #28783 from nextchamp-saqib/hsn-wise-summary-report-fix 
fix: hsn-wise summary is incorrect if an invoice has repeated item code
 2021-12-13 22:39:32 +05:30
Saqib Ansari
6a239c8ea3 test: test_hsn_summary_for_invoice_with_duplicate_items 2021-12-13 20:58:35 +05:30
Saqib Ansari
e74739a677 fix: hsn-wise summary is incorrect if an invoice has repeated item code 2021-12-12 19:53:33 +05:30
Deepesh Garg
121f8ae865
Merge pull request #28776 from rtdany10/ksa-vat-updates 
feat(Regional): KSA E-Invoing optimizations and POS support
 2021-12-08 22:32:24 +05:30
Deepesh Garg
d5380dd716 fix: Error on Invoice generation 
(cherry picked from commit 82255293c4eb8a9f586db083d19d63c1ea435fb9)
 2021-12-08 08:42:29 +00:00
Dany Robert
4a316550f4 chore: POS invoice format changes 2021-12-08 07:25:41 +00:00
Deepesh Garg
948b67b744
Merge branch 'develop' into ksa-vat-updates 2021-12-08 09:38:11 +05:30
Dany Robert
3e97492da4
fix: replace frappe.get_all 2021-12-08 08:03:30 +05:30
Dany Robert
ca85094728
chore: switch to frappe.db.set_value 2021-12-08 07:52:06 +05:30
Deepesh Garg
cb21dff882 fix: Error on creating invoice 
(cherry picked from commit e11515a3561eac6d33d21190cac2db112ae301fb)
 2021-12-07 16:51:02 +00:00
Dany Robert
45fce5a64b
chore: linters 2021-12-07 18:29:16 +05:30
Dany Robert
a0aeacee8e fix: reload doc 2021-12-07 12:39:39 +00:00
Dany Robert
bb3119cd1f feat(Regional): enable KSA print formats on setup 2021-12-07 11:05:41 +00:00
Dany Robert
293d981af9 feat(Regional): POS Invoice format for KSA 2021-12-07 11:03:22 +00:00
Dany Robert
09f178ceee fix: disable ksa vat invoice by default 2021-12-07 11:01:37 +00:00
Dany Robert
d06c4b50cd
feat: create QR field in POS Invoice 2021-12-07 12:29:59 +05:30
Dany Robert
f0fee5672f
chore: change QR field label 2021-12-07 12:18:32 +05:30
Dany Robert
6a6d6f7f8b
fix: localize QR fieldname 2021-12-07 12:17:45 +05:30
Dany Robert
ebd4179295
fix: get doctype from doc instead of hardcoding SI 2021-12-07 12:15:58 +05:30
Dany Robert
276bf73974
feat: create QR Code field if not existing 2021-12-07 12:11:43 +05:30
Saqib
7511a9ed31
fix(ksa): qrcode for invoices with special chars (#28715) 2021-12-03 16:13:44 +05:30
Deepesh Garg
a8f283bb20
Merge pull request #28708 from deepeshgarg007/ksa_qr_invoice_total 
fix: Invoice amount in KSA E Invoice QR Code
 2021-12-03 15:18:15 +05:30
Deepesh Garg
f2ffddf059 fix: Invocie amount in KSA E Invoice QR Code 2021-12-03 14:32:52 +05:30
Deepesh Garg
c339240250
Merge pull request #28698 from frappe/mergify/bp/develop/pr-28654 
fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice (backport #28654)
 2021-12-03 14:26:43 +05:30
Rucha Mahabal
0b1808e1ee
fix(Non Profit): fetch memberships for 80G certificate by from date only (#28700) 2021-12-03 11:46:14 +05:30
Saqib
9c60c45acf
fix: Create Depreciation Schedules for existing Assets accurately (#28675) 2021-12-03 11:30:47 +05:30
Saqib
7314aee394
fix: qrcode image name for invoices with special chars (#28699) 2021-12-03 11:29:51 +05:30
Deepesh Garg
35e2bd89c0 fix: India utils code cleanup 
(cherry picked from commit 56c626adbfbd04e7e9063f6500ec380f7bfb3da4)
 2021-12-03 04:12:43 +00:00
GangaManoj
828769ca70 fix: Remove unnecessary variable 2021-12-02 01:09:15 +05:30
GangaManoj
22cc8d2246 fix: Fix depreciation_amount calculation 2021-12-01 21:46:09 +05:30
Deepesh Garg
641f033337
Merge pull request #28385 from vorasmit/fix-hsn_wise 
fix(regional): `hsn_wise` as false returns `item_code`
 2021-11-29 18:08:34 +05:30
Deepesh Garg
2bed4140f3
Merge pull request #28605 from deepeshgarg007/ksa-e-invoice-new 
refactor(KSA VAT): QR Code as per ZATKA specification
 2021-11-29 16:46:14 +05:30
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
Deepesh Garg
af6fc29770 fix: KSA print format for invoices not having item codes 2021-11-29 16:18:35 +05:30
Deepesh Garg
f3f7ed6f0d fix: Translations 2021-11-29 13:43:56 +05:30
Ahmad
31b9b84fdf fix: KSA VAT QR Code arabic conversion 2021-11-29 13:43:02 +05:30
Ahmad
de784d8bfe refactor: comments removed 2021-11-29 13:43:02 +05:30
Ahmad
d1746caa02 refactor(KSA VAT): QR Code as per ZATKA specification 2021-11-29 13:43:02 +05:30