Commit Graph

39770 Commits

Author SHA1 Message Date
Deepesh Garg
0d9b0fe6dc
Merge pull request #28464 from mhbu50/develop
fix:Change QR Code Triggerr event
2021-11-29 18:46:56 +05:30
Deepesh Garg
4382040fb6
fix: Move trigger from on trash to on cancel 2021-11-29 18:25:47 +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
rohitwaghchaure
f872878638
Merge pull request #28500 from rohitwaghchaure/feat-report-to-view-consumed-materials
feat: report to see the consumed materials against the work order
2021-11-29 17:53:44 +05:30
rohitwaghchaure
3d2efb76d3
fix: linters issue 2021-11-29 17:52:55 +05:30
rohitwaghchaure
56b5ac0939
Merge pull request #28611 from rohitwaghchaure/changed-fieldtype-from-int-to-float
fix: changed fieldtype from int to float for the field Batch Size in the Work Order Operation table
2021-11-29 17:13:24 +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
Rohit Waghchaure
7fac9b8e9c fix: changed fieldtype from int to float for the field Batch Size in the work order 2021-11-29 16:40:55 +05:30
vorasmit
e5ca9f3c1b
Merge branch 'develop' into fix-hsn_wise 2021-11-29 16:33:21 +05:30
rohitwaghchaure
570ae422a8
Update work_order_consumed_materials.py 2021-11-29 16:25:30 +05:30
Deepesh Garg
af6fc29770 fix: KSA print format for invoices not having item codes 2021-11-29 16:18:35 +05:30
Saqib
c0cc72ec1d
fix: incorrect discount amount set when item is replaced (#28556) 2021-11-29 15:05:06 +05:30
Rucha Mahabal
baf41fdc9c
fix: Employee Advance paid amount not updated on PE cancellation (#28572)
* fix: employee advance paid amount not updated on PE cancellation

* fix: convert raw sql queries to qb

* test: Employee Advance Paid Amount on PE cancellation

* chore: disable no copy for sanctioned amount in Expense Claim
2021-11-29 14:23:06 +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
Ankush Menat
c7701ace80 chore: correct docstrings 2021-11-29 13:04:29 +05:30
Ankush Menat
f862339024 fix: use get_all instead of get_list for child tables 2021-11-29 13:04:29 +05:30
Jannat Patel
8cc1dc8079
Merge branch 'develop' into home-onboarding 2021-11-29 10:24:06 +05:30
Deepesh Garg
37c318a65f
Merge pull request #28592 from hrwX/remove_gst_section
fix: do not add gst fields if no indian company
2021-11-29 09:26:42 +05:30
Himanshu
de6f104b74
Delete __init__.py 2021-11-27 23:16:34 +00:00
hrwx
43038aab79 fix: do not add gst fields if no indian company 2021-11-27 21:46:13 +00:00
xdlumertz
cdaf0a04cf
fix(ux): allow translations (#28455)
* Translation

* Translations

Co-authored-by: xdlumertz <alexandrelumertz@gmail>
2021-11-27 15:03:35 +00:00
Ankush Menat
69a17b9e51
refactor: move Bin queries to qb/orm (#28522) 2021-11-27 20:07:02 +05:30
Saqib Ansari
79f8159ab9 test: issue closing after being on hold 2021-11-27 17:14:58 +05:30
Saqib Ansari
267cc35850 fix: failing tests 2021-11-27 16:47:45 +05:30
Ganga Manoj
7bbc708e8a
Merge branch 'develop' into serialized-item-consumption 2021-11-26 20:44:35 +05:30
Saqib Ansari
214d0e367f fix: remove leading whitespace 2021-11-26 20:20:38 +05:30
Saqib Ansari
a8c75b6862 refactor: application of SLA and its metrics 2021-11-26 20:16:21 +05:30
Noah Jacob
7ff30a4b2b
fix: incorrect balance for warehouses (#28583) 2021-11-26 17:33:57 +05:30
Ankush Menat
efec85d5cd
chore: correct __version__ on develop branch. (#28582) 2021-11-26 16:29:21 +05:30
Saqib Ansari
210f593a49 refactor: SLA form fields 2021-11-26 15:49:17 +05:30
Deepesh Garg
38dfb60243
Merge pull request #27348 from deepeshgarg007/advance_tds_allocation_gl
fix (refactor): Tax Withholding for Advances using Payment Entry against suppliers
2021-11-26 14:28:50 +05:30
marination
dfff972a78 fix: Linter (imports) 2021-11-26 13:29:05 +05:30
Rucha Mahabal
ca8dec0cf2
fix: Use get_all instead of get_list for child doctype (#28538)
* fix(Student Attendance Tool): Use `get_all` instead of `get_list` for child doctype

* fix(Course Schedule): incorrect fetch from value

* fix: sider

* fix(Gratuity): Use `get_all` instead of `get_list` for child doctype
2021-11-26 13:24:32 +05:30
Marica
26207d9517
Merge branch 'develop' into independent-manu-entry 2021-11-26 13:20:33 +05:30
marination
affb29194b test: Independent Manufacture Entry
- Check validations
- Check if FG basic rate is calculated correctly
2021-11-26 13:19:04 +05:30
Shariq Ansari
2a5f663a1e
fix: Customer, Supplier heatmap data not rendering (#28553)
* fix: adding get_timeline_data import on supplier.py, customer.py
2021-11-26 12:58:43 +05:30
Saqib
9c913c9b2d
fix: over billing validation (#28218) 2021-11-26 12:00:13 +05:30
Noah Jacob
73bfd59846
fix: checkbox triggers get_items and sub_assembly buttons (#28558) 2021-11-26 11:53:35 +05:30
Deepesh Garg
7f06c8ca57 fix: Incorrect indentation 2021-11-26 10:27:57 +05:30
Deepesh Garg
f07f010962 fix: Add tests 2021-11-25 23:58:16 +05:30
GangaManoj
c94f1ed39a fix: Change order of import statements 2021-11-25 22:18:57 +05:30
GangaManoj
b28f137ee8 fix: Remove unused import 2021-11-25 22:17:54 +05:30
GangaManoj
6b75d1439f fix: Add test for consumption of serialized Assets 2021-11-25 22:10:24 +05:30
Ganga Manoj
209750d036
Merge branch 'develop' into depr-expense-account 2021-11-25 20:01:58 +05:30
Ganga Manoj
43b8936f1c
Merge branch 'develop' into fix-clear-depr-schedule 2021-11-25 20:01:06 +05:30
Ganga Manoj
a1055d6bd3
Merge branch 'develop' into product-bundle-fixes 2021-11-25 20:00:30 +05:30
Ankush Menat
87f2dcfb59
fix: total stock summary UI glitch #28564
fix: total stock summary UI glitch
2021-11-25 19:38:44 +05:30