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

39522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepesh Garg
107fb43d6a fix: Paid showing in AR/AP report 
(cherry picked from commit 5e7ce5370f6af634f7674772529cf4933114f3ef)
 2021-12-02 13:44:27 +00:00
Ankush Menat
a37c99a23d
fix: dont requeue repost immediately and clear progress (#28684) 2021-12-02 14:51:04 +05:30
Saqib
fa42cf796b
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 12:13:12 +05:30
Saqib
4889661e5c
fix: actual tax conversion in case of multicurrency invoices (#28539) 2021-12-02 11:37:08 +05:30
Saqib
92860f46ac
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-02 11:35:26 +05:30
Ganga Manoj
9bc28210c9
fix: Make buttons translatable (#28679) 2021-12-02 11:31:38 +05:30
Saqib
38cbaa3168
Merge branch 'develop' into depreciate-existing-asset 2021-12-02 11:20:49 +05:30
Deepesh Garg
322c700eb9
Merge pull request #28533 from GangaManoj/product-bundle-fixes 
fix: misc minor Product Bundle fixes
 2021-12-02 09:20:40 +05:30
GangaManoj
828769ca70 fix: Remove unnecessary variable 2021-12-02 01:09:15 +05:30
Ganga Manoj
dc3449c304
Merge branch 'develop' into product-bundle-fixes 2021-12-01 23:27:40 +05:30
GangaManoj
774ac852c9 fix: Test if depreciation schedules are set up properly for existing assets 2021-12-01 22:51:55 +05:30
GangaManoj
de002005ac fix: Modify has_pro_rata() to include existing assets 2021-12-01 22:51:08 +05:30
GangaManoj
5c3d4caeda fix: Create Depreciation Schedules properly for existing Assets 2021-12-01 21:48:47 +05:30
GangaManoj
22cc8d2246 fix: Fix depreciation_amount calculation 2021-12-01 21:46:09 +05:30
Ankush Menat
fdffa037b5
test: dynamic fiscal year creation in tests (#28667) 2021-12-01 17:31:17 +05:30
Ankush Menat
445966ab80
test: timeout certain tests in work order to avoid stuck tests (#28666) 
[skip ci]
 2021-12-01 16:34:05 +05:30
Saqib
802d583031
Merge branch 'develop' into taxjar-nexus-display-condition 2021-12-01 15:22:39 +05:30
Dany Robert
3708cf17ad
fix(POS Profile): replace cur_frm with frm (#28390) 2021-12-01 12:14:06 +05:30
Saqib
01d8b8519f
fix: cannot load company form (#28535) 2021-12-01 12:11:30 +05:30
Subin Tom
ecc5de6159 fix: removing db call for variables 2021-12-01 11:54:59 +05:30
Sagar Vora
ab280f7142
fix: update modified timestamp for delivery note #28657 
fix: update `modified` timestamp for delivery note
 2021-12-01 11:01:49 +05:30
GangaManoj
a473e1dbe9 fix: Add item to packing list 2021-12-01 01:29:35 +05:30
Subin Tom
0963fceede fix: Taxjar Nexus list visible only if child table is visible 2021-11-30 22:05:29 +05:30
mergify[bot]
071118fa4e
fix: Unable to search project by project name in Sales Invoice (bp #28648) 
(cherry picked from commit 08b7c856b2ee94d1f8ac2c019c556eef4d7dd7da)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-11-30 13:15:20 +00:00
Deepesh Garg
ad8d296c08
Merge pull request #28636 from deepeshgarg007/zero_values_report 
feat: Show Zero Values filter in consolidated financial statement
 2021-11-30 18:15:50 +05:30
Ankush Menat
0854c183aa
chore: remove duplicate code (#28646) 
[skip ci]
 2021-11-30 17:57:53 +05:30
Raffael Meyer
e10ab1626c
feat: Grant commission on certain items only (#27467) 
Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2021-11-30 17:54:18 +05:30
Rucha Mahabal
d0f4f03b66
fix: Employee Transfer and Project Profitability test cases (#28633) 
* fix: Employee Transfer testcases

* fix: Project Profitability test case
 2021-11-30 14:04:47 +05:30
Deepesh Garg
9610086d0c feat: Show Zero Values filter in consolidated financial statement 2021-11-30 13:24:23 +05:30
Ankush Menat
aeb62af544 fix(ux): remove attachment limits 2021-11-30 12:46:53 +05:30
Rucha Mahabal
4458b24813
fix: allow creating Shift Assignment for same day (#28613) 2021-11-30 10:15:41 +05:30
Saqib
fb14b0901c
feat: Let serialised Items be consumed during Asset Repairs (#28349) 2021-11-29 20:42:56 +05:30
Subin Tom
2f6a6afaa8
feat(pos): Total item qty field to POS screen (#28331) 2021-11-29 20:35:49 +05:30
Ganga Manoj
7a15f85f22
Merge branch 'develop' into serialized-item-consumption 2021-11-29 20:01:11 +05:30
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